diff options
| author | Antoine Cellerier <dionoea@videolan.org> | 2011-01-24 17:06:04 +0000 |
|---|---|---|
| committer | Antoine Cellerier <dionoea@videolan.org> | 2011-01-24 17:06:04 +0000 |
| commit | a448d8bac7c97c008afcc0c435c7e9777c069b26 (patch) | |
| tree | 2b39ae642c661af0cf7ce9a90e9179ee10d67346 /android/android.make | |
| parent | 9b02ce9e498e8c3580a25852c17345df710b4893 (diff) | |
| download | rockbox-a448d8bac7c97c008afcc0c435c7e9777c069b26.zip rockbox-a448d8bac7c97c008afcc0c435c7e9777c069b26.tar.gz rockbox-a448d8bac7c97c008afcc0c435c7e9777c069b26.tar.bz2 rockbox-a448d8bac7c97c008afcc0c435c7e9777c069b26.tar.xz | |
Android build tweaks.
Add make install target for android builds.
Remove standard install targets as they don't apply.
Add java compilation dependancy on generated resource class(es?) to prevent weird runtime issues.
Update installApk.sh script to use correct tool location in recent sdks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29131 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'android/android.make')
| -rw-r--r-- | android/android.make | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/android/android.make b/android/android.make index b28f5c9..82a8ded 100644 --- a/android/android.make +++ b/android/android.make @@ -31,6 +31,7 @@ DX=$(ANDROID_PLATFORM)/tools/dx APKBUILDER=$(ANDROID_SDK_PATH)/tools/apkbuilder ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign KEYSTORE=$(HOME)/.android/debug.keystore +ADB=$(ANDROID_SDK_PATH)/platform-tools/adb MANIFEST := $(ANDROID_DIR)/AndroidManifest.xml @@ -69,7 +70,7 @@ $(BUILDDIR)/bin/$(PACKAGE_PATH)/R.class: $(R_JAVA) -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin \ -sourcepath $(ANDROID_DIR)/gen:$(ANDROID_DIR)/src $< -$(BUILDDIR)/bin/$(PACKAGE_PATH)/%.class: $(ANDROID_DIR)/src/$(PACKAGE_PATH)/%.java +$(BUILDDIR)/bin/$(PACKAGE_PATH)/%.class: $(ANDROID_DIR)/src/$(PACKAGE_PATH)/%.java $(BUILDDIR)/bin/$(PACKAGE_PATH)/R.class $(call PRINTS,JAVAC $(subst $(ROOTDIR)/,,$<))javac -d $(BUILDDIR)/bin \ -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin \ -sourcepath $(ANDROID_DIR)/gen:$(ANDROID_DIR)/src $< @@ -112,3 +113,7 @@ $(DIRS): dirs: $(DIRS) apk: $(APK) + +install: apk + $(ADB) install -r $(APK) + |