diff options
| author | Angus Lees | 2010-07-05 01:00:59 +0000 |
|---|---|---|
| committer | Angus Lees | 2010-07-05 01:00:59 +0000 |
| commit | b8778fc7c382ec401409bbaafcb67355f0c566e3 (patch) | |
| tree | b451a4f2700dcb83eb729d8096f893d0c064f3ab /backends/platform/android/android.mk | |
| parent | bb300ec671cfcd6fe7461dfd90615acfede2f1b9 (diff) | |
| download | scummvm-rg350-b8778fc7c382ec401409bbaafcb67355f0c566e3.tar.gz scummvm-rg350-b8778fc7c382ec401409bbaafcb67355f0c566e3.tar.bz2 scummvm-rg350-b8778fc7c382ec401409bbaafcb67355f0c566e3.zip | |
Switch Android toolchain prefix from arm-android-eabi to
arm-*-linux-androideabi, since this is what the upcoming gcc-4.6
change uses.
Work around Android 2.0 and newer dynamic linker bug by explicitly
linking plugins against the core libscummvm.so.
Mark Android packages as preferring to be on external storage.
Move -lm from LDFLAGS to LIBS.
svn-id: r50665
Diffstat (limited to 'backends/platform/android/android.mk')
| -rw-r--r-- | backends/platform/android/android.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk index 0bc8fa265e..95e848e0d9 100644 --- a/backends/platform/android/android.mk +++ b/backends/platform/android/android.mk @@ -4,7 +4,6 @@ AAPT = aapt DX = dx APKBUILDER = apkbuilder ADB = adb -e -ANDROID_JAR = $(ANDROID_SDK)/platforms/android-1.6/android.jar JAVAC ?= javac JAVACFLAGS = -source 1.5 -target 1.5 @@ -12,6 +11,14 @@ JAVACFLAGS = -source 1.5 -target 1.5 #LDFLAGS += -Wl,--gc-sections #CXXFLAGS += -ffunction-sections -fdata-sections -fvisibility=hidden -fvisibility-inlines-hidden +resources.ap_: $(srcdir)/dists/android/AndroidManifest.xml $(RESOURCES) $(ASSETS) $(ANDROID_JAR8) $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) + $(INSTALL) -d build.tmp/assets/ + $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) build.tmp/assets/ + $(AAPT) package -f -M $< -S $(srcdir)/dists/android/res -A build.tmp/assets -I $(ANDROID_JAR8) -F $@ + +build.tmp/%/resources.ap_: build.tmp/%/AndroidManifest.xml build.stage/%/res/values/strings.xml build.stage/%/res/drawable/scummvm.png $(ANDROID_JAR8) + $(AAPT) package -f -M $< -S build.stage/$*/res -I $(ANDROID_JAR8) -F $@ + scummvm.apk: build.tmp/libscummvm.so resources.ap_ classes.dex # Package installer won't delete old libscummvm.so on upgrade so # replace it with a zero size file |