diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-08-23 12:26:52 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-08-23 12:28:59 +0300 |
| commit | c02e838ec21408cd5ba70e0e7b53309411d49db2 (patch) | |
| tree | 78b234861752bd7741e77be3e80d7a4ed2833de8 /android/Bootstrap | |
| parent | 6737f12e0a4a10a591dcc780de586f205e094f2f (diff) | |
Factor out the Android APP_ABI sanely instead of copy-paste galore
Change-Id: I66e97d73c410ac6f2e481ba9b2b22183f57438bd
Diffstat (limited to 'android/Bootstrap')
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index f18c18739b31..2dd202358af1 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -11,14 +11,8 @@ # code are very much self-contained pre-packaged thingies. APP_DATA_PATH=/data/data/$(APP_PACKAGE) -# Adapt to both Intel and ARM architectures -ifeq ($(CPU),I) -ABI_PATH=x86 -else -ABI_PATH=armeabi-v7a -endif -SODEST=libs/$(ABI_PATH) -OBJLOCAL=obj/local/$(ABI_PATH) +SODEST=libs/$(ANDROID_APP_ABI) +OBJLOCAL=obj/local/$(ANDROID_APP_ABI) define COPYSO cp $(1) $(SODEST)$(if $(2),/$(2)) && $(STRIP) --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir $(1))) && \ @@ -36,7 +30,7 @@ endef properties: echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties - echo "APP_ABI := $(ABI_PATH)" > jni/Application.mk + echo "APP_ABI := $(ANDROID_APP_ABI)" > jni/Application.mk echo "APP_PLATFORM := android-14" >> jni/Application.mk install: build-ant |