summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2016-06-29 14:05:22 +0200
committerIvo van Dongen <info@ivovandongen.nl>2016-07-07 10:08:43 +0200
commit01da4ddbf1d4061582167a2f097430163d4d4b2f (patch)
treeca6318a506263f3c2b74f0b4c7d73ffc4dc43784
parent4ff12a8269708f9b989c1ec45d5cca0b7b5db284 (diff)
downloadqtlocation-mapboxgl-01da4ddbf1d4061582167a2f097430163d4d4b2f.tar.gz
[android] #5456 - cleanup
-rw-r--r--Makefile2
-rw-r--r--platform/android/platform.gyp4
2 files changed, 1 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index bb76ef52b7..580ff71e0f 100644
--- a/Makefile
+++ b/Makefile
@@ -190,7 +190,7 @@ $(foreach abi,$(ANDROID_ABIS),$(eval $(call ANDROID_RULES,$(abi))))
android: android-arm-v7
test-android: android-test-lib-arm-v7
- #TODO Decide where to place the class files and other tmp outputs
+ #TODO Decide where to place the class files and other tmp outputs
#Compile main sources and extract the classes (using the test app to get all transitive dependencies in one place)
cd platform/android && ./gradlew assembleDebug
unzip -o platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug.apk classes.dex -d build
diff --git a/platform/android/platform.gyp b/platform/android/platform.gyp
index 6aa94b95b2..da9d518928 100644
--- a/platform/android/platform.gyp
+++ b/platform/android/platform.gyp
@@ -172,10 +172,6 @@
'<@(libjpeg-turbo_cflags)',
],
-# 'cflags_cc': [
-# '<@(jni.hpp_cflags)',
-# ],
-
'link_settings': {
'libraries': [
'-llog',