diff options
| -rw-r--r-- | dx/Android.mk | 4 | ||||
| -rw-r--r-- | dx/src/Android.mk | 15 |
2 files changed, 12 insertions, 7 deletions
diff --git a/dx/Android.mk b/dx/Android.mk index ecb5a1c06..3756e1412 100644 --- a/dx/Android.mk +++ b/dx/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH := $(call my-dir) # .jar files they wrap. # This tool is prebuilt if we're doing an app-only build. -ifeq ($(TARGET_BUILD_APPS),) +ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),) # the dx script # ============================================================ @@ -88,7 +88,7 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/mainDexClasses | $(ACP) $(LOCAL_INSTALLED_MODULE): | $(installed_shrinkedAndroid) $(installed_mainDexClasses.rules) INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE) -endif # TARGET_BUILD_APPS +endif # No TARGET_BUILD_APPS or TARGET_BUILD_PDK # the dexmerger script # ============================================================ diff --git a/dx/src/Android.mk b/dx/src/Android.mk index bc9fb2e7a..b9673dba4 100644 --- a/dx/src/Android.mk +++ b/dx/src/Android.mk @@ -3,14 +3,17 @@ LOCAL_PATH := $(call my-dir) # This tool is prebuilt if we're doing an app-only build. -ifeq ($(TARGET_BUILD_APPS),) +ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),) + +dx_src_files := \ + $(call all-subdir-java-files) \ + $(call all-java-files-under,../../../libcore/dex/src/main/java) # dx java library # ============================================================ include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_SRC_FILES += $(call all-java-files-under,../../../libcore/dex/src/main/java) +LOCAL_SRC_FILES := $(dx_src_files) LOCAL_JAR_MANIFEST := ../etc/manifest.txt LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= dx @@ -23,13 +26,13 @@ include $(BUILD_HOST_JAVA_LIBRARY) INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE) -endif # TARGET_BUILD_APPS +endif # No TARGET_BUILD_APPS or TARGET_BUILD_PDK # the documentation # ============================================================ include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-subdir-java-files) $(call all-subdir-html-files) +LOCAL_SRC_FILES := $(dx_src_files) $(call all-subdir-html-files) LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= dx LOCAL_DROIDDOC_OPTIONS := -hidden @@ -37,3 +40,5 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_IS_HOST_MODULE := true include $(BUILD_DROIDDOC) + +dx_src_files := |