diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-08-23 12:33:37 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-08-23 12:37:21 +0300 |
| commit | 811751bbadbf2cc6f77fc1a7f311fec9edc7d937 (patch) | |
| tree | 785e61b3396f0f4b97479ff8e46b01628c72fe02 /android | |
| parent | 0d68487f10de1783974a41592526e6df55cf97e9 (diff) | |
Don't hardcode jni/Application.mk either
Change-Id: Id8787a04a3b1720490e7d79a254ca11835df242a
Diffstat (limited to 'android')
| -rw-r--r-- | android/experimental/DocumentLoader/Makefile | 3 | ||||
| -rw-r--r-- | android/experimental/DocumentLoader/jni/Application.mk | 3 | ||||
| -rw-r--r-- | android/qa/sc/Makefile | 3 | ||||
| -rw-r--r-- | android/qa/sc/jni/Application.mk | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 804d91562ed7..adff84f301ff 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -35,6 +35,9 @@ all: build-ant properties: echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties + echo "# File needed by ndk-gdb" >jni/Application.mk + echo "APP_ABI := $(ANDROID_APP_ABI)" >>jni/Application.mk + echo "APP_PLATFORM := android-14" >>jni/Application.mk copy-stuff: # First always clean diff --git a/android/experimental/DocumentLoader/jni/Application.mk b/android/experimental/DocumentLoader/jni/Application.mk deleted file mode 100644 index f326d1a59879..000000000000 --- a/android/experimental/DocumentLoader/jni/Application.mk +++ /dev/null @@ -1,3 +0,0 @@ -# File needed by ndk-gdb -APP_ABI := armeabi-v7a -APP_PLATFORM := android-14 diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index 91f4c484592e..b77c5cfe78ca 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -26,6 +26,9 @@ all: build-ant properties: echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties + echo "# File needed by ndk-gdb" >jni/Application.mk + echo "APP_ABI := $(ANDROID_APP_ABI)" >>jni/Application.mk + echo "APP_PLATFORM := android-14" >>jni/Application.mk copy-stuff: # diff --git a/android/qa/sc/jni/Application.mk b/android/qa/sc/jni/Application.mk deleted file mode 100644 index a11b28debc0c..000000000000 --- a/android/qa/sc/jni/Application.mk +++ /dev/null @@ -1,2 +0,0 @@ -APP_ABI := armeabi-v7a -APP_PLATFORM := android-14 |