summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-12-11 12:39:43 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-12-16 14:52:29 -0800
commit13d5b18ebaeb330f05c4abfc04e0247222e038ba (patch)
tree90e24f1fb745581767b6979d1c562e60859cbcf6 /Makefile
parent0db9f229f2bb14e2c6ccd3a8c0d0a30eb25ea5c5 (diff)
downloadqtlocation-mapboxgl-13d5b18ebaeb330f05c4abfc04e0247222e038ba.tar.gz
[android] Move into platform subdirectory
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 20ec49f8ce..364aaad939 100644
--- a/Makefile
+++ b/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