summaryrefslogtreecommitdiff
path: root/android/android.make
diff options
context:
space:
mode:
Diffstat (limited to 'android/android.make')
-rw-r--r--android/android.make7
1 files changed, 6 insertions, 1 deletions
diff --git a/android/android.make b/android/android.make
index b28f5c943c..82a8dedf24 100644
--- a/android/android.make
+++ b/android/android.make
@@ -31,6 +31,7 @@ DX=$(ANDROID_PLATFORM)/tools/dx
31APKBUILDER=$(ANDROID_SDK_PATH)/tools/apkbuilder 31APKBUILDER=$(ANDROID_SDK_PATH)/tools/apkbuilder
32ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign 32ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign
33KEYSTORE=$(HOME)/.android/debug.keystore 33KEYSTORE=$(HOME)/.android/debug.keystore
34ADB=$(ANDROID_SDK_PATH)/platform-tools/adb
34 35
35MANIFEST := $(ANDROID_DIR)/AndroidManifest.xml 36MANIFEST := $(ANDROID_DIR)/AndroidManifest.xml
36 37
@@ -69,7 +70,7 @@ $(BUILDDIR)/bin/$(PACKAGE_PATH)/R.class: $(R_JAVA)
69 -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin \ 70 -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin \
70 -sourcepath $(ANDROID_DIR)/gen:$(ANDROID_DIR)/src $< 71 -sourcepath $(ANDROID_DIR)/gen:$(ANDROID_DIR)/src $<
71 72
72$(BUILDDIR)/bin/$(PACKAGE_PATH)/%.class: $(ANDROID_DIR)/src/$(PACKAGE_PATH)/%.java 73$(BUILDDIR)/bin/$(PACKAGE_PATH)/%.class: $(ANDROID_DIR)/src/$(PACKAGE_PATH)/%.java $(BUILDDIR)/bin/$(PACKAGE_PATH)/R.class
73 $(call PRINTS,JAVAC $(subst $(ROOTDIR)/,,$<))javac -d $(BUILDDIR)/bin \ 74 $(call PRINTS,JAVAC $(subst $(ROOTDIR)/,,$<))javac -d $(BUILDDIR)/bin \
74 -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin \ 75 -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin \
75 -sourcepath $(ANDROID_DIR)/gen:$(ANDROID_DIR)/src $< 76 -sourcepath $(ANDROID_DIR)/gen:$(ANDROID_DIR)/src $<
@@ -112,3 +113,7 @@ $(DIRS):
112dirs: $(DIRS) 113dirs: $(DIRS)
113 114
114apk: $(APK) 115apk: $(APK)
116
117install: apk
118 $(ADB) install -r $(APK)
119