diff --git a/README.md b/README.md
index 37286012..7a0f8763 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Use it to generate a platform-specific build configuration for building all exam
### [Android](android/)
-The repository also contains a few Android examples to get started, check the [Android readme](./android/README.md) for details.
+I'm currently adding Android support to the examples, replacing the initial separate examples. Please see the [Android readme](./android/README.md) on how to build these and a few notes on the platform.
## Binaries
@@ -108,7 +108,7 @@ Based on the mesh loading example, this example loads and displays a rigged COLL
## [Particle system](particlefire/)
-Point sprite based particle system simulating a fire. Particles and their attributes are stored in a host visible vertex buffer that's updated on the CPU on each frame. Also makes use of pre-multiplied alpha for rendering particles with different blending modes (smoke and fire) in one single pass.
+Point sprite based particle system simulating a fire. Particles and their attributes are stored in a host visible vertex buffer that's updated on the CPU on each frame. Also makes use of pre-multiplied alpha for rendering particles with different blending modes (smoke and fire) in one single pass.
diff --git a/android/README.md b/android/README.md
index 3422fd15..b66c23ed 100644
--- a/android/README.md
+++ b/android/README.md
@@ -1,35 +1,43 @@
-# Vulkan examples and demos - Android
-
-## Building
-
-The examples have been built using Visual Studio 2015 and require the Android NDK for building.
+# Vulkan examples on Android
## Vulkan on Android
Since Vulkan is not yet part of the Android OS (like OpenGL ES) the library and function pointers need to be dynamically loaded before using any of the Vulkan functions. See the **vulkanandroid.h** and **vulkanandroid.cpp** files in the base folder of the repositoy root for how this is done.
-**To run these examples you need a device with an Android image that suports Vulkan and has the libvulkan.so preinstalled!**
+## Device support
+- **To run these examples you need a device with an Android image that suports Vulkan**
+- Builds currently only support arm-v7, x86 may follow at a later point
+- Android TV leanback launcher is supported, examples will show up on the launcher
+- Basic gamepad support is available too (zoom and rotate)
-## Examples
+## Imporant note
-## Triangle
-
-Demonstrates a basic Vulkan setup for Android for rendering a triangle. A real life application would encapulate most of the Vulkan object creation stuff (which is done in subsequent examples), so this is more of an example to study how Vulkan works. Also sets up a swap chain for presenting the rendered images to the windowing system.
+I'm currently in the process of replacing the old (separate) Android examples, integrating Android support into the main line of examples. This is a work-in-progress, so the examples that are already converted may contain errors. Most notably they won't free the Vulkan resources for now.
-
+## Building
-## Texture mapping
-
-Loads a mipmapped texture from the asset manager and it on a simple quad. Shows how to upload a texture including mip maps to the gpu in an optimal (tiling) format. Also demonstrates how to display the texture using a combined image sampler with anisotropic filtering enabled.
-
+### Requirements
+- [Android NDK r11b](http://developer.android.com/ndk/downloads/index.html) - Somewhere in your sarch path
+- Batch files for building are provided for windows only, with linux to be added at some point
-## Mesh loading and rendering
-
+### Building the Examples
-Uses [syoyos' tinyobj loader](https://github.com/syoyo/tinyobjloader) to load and render a mesh from the asset manager. The mesh data is then converted to a fixed vertex layout matching the pipeline (and shader) layout descriptions.
-
+Builds are started using the provided batch file for each example.
-## Compute shader Particle system
-
+#### Build only
-Attraction based particle system. A shader storage buffer is used to store particle data and updated by a compute shader. The buffer is then used by the graphics pipeline for rendering.
+Call the corresponding .bat, call e.g. :
+
+```
+build-triangle.bat
+```
+
+This will build the apk and move it to the "bin" folder
+
+#### Deploy
+
+If you want to deploy to an attached Android device right after the build is done :
+
+```
+build-triangle.bat -deploy
+```
diff --git a/android/mesh/jni/Application.mk b/android/mesh/jni/Application.mk
new file mode 100644
index 00000000..62020feb
--- /dev/null
+++ b/android/mesh/jni/Application.mk
@@ -0,0 +1,5 @@
+APP_PLATFORM := android-19
+APP_ABI := armeabi-v7a
+APP_STL := c++_static
+APP_CPPFLAGS := -std=c++11
+NDK_TOOLCHAIN_VERSION := clang
diff --git a/android/screenshots/compute_particles.png b/android/screenshots/compute_particles.png
deleted file mode 100644
index c26e2176..00000000
Binary files a/android/screenshots/compute_particles.png and /dev/null differ
diff --git a/android/screenshots/mesh_rendering.png b/android/screenshots/mesh_rendering.png
deleted file mode 100644
index be57c780..00000000
Binary files a/android/screenshots/mesh_rendering.png and /dev/null differ
diff --git a/android/screenshots/texture_mapping.png b/android/screenshots/texture_mapping.png
deleted file mode 100644
index 986f090d..00000000
Binary files a/android/screenshots/texture_mapping.png and /dev/null differ
diff --git a/android/screenshots/triangle.png b/android/screenshots/triangle.png
deleted file mode 100644
index 0c9a989b..00000000
Binary files a/android/screenshots/triangle.png and /dev/null differ