diff options
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 b28f5c943c..82a8dedf24 100644 --- a/android/android.make +++ b/android/android.make | |||
@@ -31,6 +31,7 @@ DX=$(ANDROID_PLATFORM)/tools/dx | |||
31 | APKBUILDER=$(ANDROID_SDK_PATH)/tools/apkbuilder | 31 | APKBUILDER=$(ANDROID_SDK_PATH)/tools/apkbuilder |
32 | ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign | 32 | ZIPALIGN=$(ANDROID_SDK_PATH)/tools/zipalign |
33 | KEYSTORE=$(HOME)/.android/debug.keystore | 33 | KEYSTORE=$(HOME)/.android/debug.keystore |
34 | ADB=$(ANDROID_SDK_PATH)/platform-tools/adb | ||
34 | 35 | ||
35 | MANIFEST := $(ANDROID_DIR)/AndroidManifest.xml | 36 | MANIFEST := $(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): | |||
112 | dirs: $(DIRS) | 113 | dirs: $(DIRS) |
113 | 114 | ||
114 | apk: $(APK) | 115 | apk: $(APK) |
116 | |||
117 | install: apk | ||
118 | $(ADB) install -r $(APK) | ||
119 | |||