diff options
Diffstat (limited to 'android')
-rw-r--r-- | android/android.make | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/android/android.make b/android/android.make index 53d5d46bbf..ab59888b79 100644 --- a/android/android.make +++ b/android/android.make | |||
@@ -61,6 +61,8 @@ RES := $(wildcard $(ANDROID_DIR)/res/*/*) | |||
61 | 61 | ||
62 | CLEANOBJS += bin gen libs data | 62 | CLEANOBJS += bin gen libs data |
63 | 63 | ||
64 | JAVAC_OPTS += -implicit:none -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin | ||
65 | |||
64 | $(R_JAVA) $(AP_): $(MANIFEST) $(DIRS) $(RES) | 66 | $(R_JAVA) $(AP_): $(MANIFEST) $(DIRS) $(RES) |
65 | $(call PRINTS,AAPT $(subst $(BUILDDIR)/,,$@))$(AAPT) package -f -m \ | 67 | $(call PRINTS,AAPT $(subst $(BUILDDIR)/,,$@))$(AAPT) package -f -m \ |
66 | -J $(BUILDDIR)/gen -M $(MANIFEST) -S $(ANDROID_DIR)/res \ | 68 | -J $(BUILDDIR)/gen -M $(MANIFEST) -S $(ANDROID_DIR)/res \ |
@@ -68,13 +70,13 @@ $(R_JAVA) $(AP_): $(MANIFEST) $(DIRS) $(RES) | |||
68 | 70 | ||
69 | $(BUILDDIR)/bin/$(PACKAGE_PATH)/R.class: $(R_JAVA) | 71 | $(BUILDDIR)/bin/$(PACKAGE_PATH)/R.class: $(R_JAVA) |
70 | $(call PRINTS,JAVAC $(subst $(ROOTDIR)/,,$<))javac -d $(BUILDDIR)/bin \ | 72 | $(call PRINTS,JAVAC $(subst $(ROOTDIR)/,,$<))javac -d $(BUILDDIR)/bin \ |
71 | -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin \ | 73 | $(JAVAC_OPTS) \ |
72 | -sourcepath $(ANDROID_DIR)/gen:$(ANDROID_DIR)/src $< | 74 | -sourcepath $(ANDROID_DIR)/gen $< |
73 | 75 | ||
74 | $(BUILDDIR)/bin/$(PACKAGE_PATH)/%.class: $(ANDROID_DIR)/src/$(PACKAGE_PATH)/%.java $(BUILDDIR)/bin/$(PACKAGE_PATH)/R.class | 76 | $(BUILDDIR)/bin/$(PACKAGE_PATH)/%.class: $(ANDROID_DIR)/src/$(PACKAGE_PATH)/%.java $(BUILDDIR)/bin/$(PACKAGE_PATH)/R.class |
75 | $(call PRINTS,JAVAC $(subst $(ROOTDIR)/,,$<))javac -d $(BUILDDIR)/bin \ | 77 | $(call PRINTS,JAVAC $(subst $(ROOTDIR)/,,$<))javac -d $(BUILDDIR)/bin \ |
76 | -classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin \ | 78 | $(JAVAC_OPTS) \ |
77 | -sourcepath $(ANDROID_DIR)/gen:$(ANDROID_DIR)/src $< | 79 | -sourcepath $(ANDROID_DIR)/src $< |
78 | 80 | ||
79 | $(DEX): $(R_OBJ) $(JAVA_OBJ) | 81 | $(DEX): $(R_OBJ) $(JAVA_OBJ) |
80 | $(call PRINTS,DX $(subst $(BUILDDIR)/,,$@))$(DX) --dex --output=$@ $(BUILDDIR)/bin | 82 | $(call PRINTS,DX $(subst $(BUILDDIR)/,,$@))$(DX) --dex --output=$@ $(BUILDDIR)/bin |