[android] Move into platform subdirectory

.gitignore

@@ -4,11 +4,11 @@
 *.actual.png
 *.diff.png
 *.pyc
-/android/debug
-/android/sdk
-/android/**/.classpath
-/android/**/.project
-/android/**/.settings/
+/platform/android/debug
+/platform/android/sdk
+/platform/android/**/.classpath
+/platform/android/**/.project
+/platform/android/**/.settings/
 /mason_packages
 /config/*.gypi
 /build

Makefile

@@ -87,13 +87,13 @@ android-lib: ; $(RUN) HOST=android Makefile/androidapp
 
 # Builds the selected/default Android library
 android: android-lib
-	cd android && ./gradlew --parallel --max-workers=$(JOBS) assemble$(BUILDTYPE)
+	cd platform/android && ./gradlew --parallel --max-workers=$(JOBS) assemble$(BUILDTYPE)
 
 # Builds all android architectures for distribution.
 apackage: android-lib-arm-v5 android-lib-arm-v7
 apackage: android-lib-x86
 apackage: android-lib-mips
-	cd android && ./gradlew --parallel-threads=$(JOBS) assemble$(BUILDTYPE)
+	cd platform/android && ./gradlew --parallel-threads=$(JOBS) assemble$(BUILDTYPE)
 
 # Builds the Node.js library
 .PHONY: node
@@ -158,8 +158,12 @@ clean: clear_sqlite_cache clear_xcode_cache
 	-rm -rf ./ios/build
 	-rm -rf ./test/build
 	-rm -rf ./config/*.gypi
-	-rm -rf ./android/build ./android/MapboxGLAndroidSDK/build ./android/MapboxGLAndroidSDKTestApp/build
-	-rm -rf ./android/MapboxGLAndroidSDK/src/main/jniLibs ./android/MapboxGLAndroidSDK/src/main/obj.target ./android/MapboxGLAndroidSDK/src/main/assets
+	-rm -rf ./platform/android/build \
+	        ./platform/android/MapboxGLAndroidSDK/build \
+	        ./platform/android/MapboxGLAndroidSDKTestApp/build \
+	        ./platform/android/MapboxGLAndroidSDK/src/main/jniLibs \
+	        ./platform/android/MapboxGLAndroidSDK/src/main/obj.target \
+	        ./platform/android/MapboxGLAndroidSDK/src/main/assets
 
 distclean: clean
 	-rm -rf ./mason_packages

docs/DEVELOP_ANDROID_OSX.md

@@ -26,10 +26,10 @@ you can edit `developer-config.xml` and add the value manually.
 
 ## Developing In Android Studio
 
-To work with the Mapbox Android SDK, you'll first need to get it set up as a Project in Android Studio.  To do so Open Android Studio and select "Import project (Eclipse ADT, Gradle, etc.)" from the Welcome to Android Studio dialog.  From there select the `android` directory from the local file system where `mapbox-gl-native` was cloned.  For example:
+To work with the Mapbox Android SDK, you'll first need to get it set up as a Project in Android Studio.  To do so Open Android Studio and select "Import project (Eclipse ADT, Gradle, etc.)" from the Welcome to Android Studio dialog.  From there select the `platform/android` directory from the local file system where `mapbox-gl-native` was cloned.  For example:
 
 ```sh
-/Users/<user>/development/mapbox-gl-native/android
+/Users/<user>/development/mapbox-gl-native/platform/android
 ```
 
 The Mapbox Android SDK is a multi-module Gradle based project.  Specifically, the SDK itself is an [Android Library](http://developer.android.com/tools/projects/index.html#LibraryModules) module and it utilizes a companion [test module](http://developer.android.com/tools/projects/index.html#testing) (aka "the TestApp") for daily development.  When Android Studio finishes importing the project both `MapboxGLAndroidSDK` and `MapboxGLAndroidSDKTestApp` modules should be visible.