diff options
| author | Colin Cross <ccross@android.com> | 2013-12-18 19:36:44 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2013-12-18 20:01:38 -0800 |
| commit | c451a373a4f07ea37aba6a50c6169d251668ba32 (patch) | |
| tree | 1dd3219f5a984d00b794560874d5bdb40067cbea /core/pdk_config.mk | |
| parent | 0d16928e60d9ed282bb8458a88d22e7fa7a0e485 (diff) | |
| download | build-c451a373a4f07ea37aba6a50c6169d251668ba32.zip build-c451a373a4f07ea37aba6a50c6169d251668ba32.tar.gz build-c451a373a4f07ea37aba6a50c6169d251668ba32.tar.bz2 | |
build: always include host java files in platform.zip
Building recovery requires building a host .jar file. Change
platform.zip to always include the necessary host java prebuilts,
instead of only when building the 'platform-java' target.
Bug: 12186985
Change-Id: Ic823d764cb6b39bbf8c5d90c94b5dc99b55d34dc
Diffstat (limited to 'core/pdk_config.mk')
| -rw-r--r-- | core/pdk_config.mk | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/core/pdk_config.mk b/core/pdk_config.mk index 886835c..a7e21e0 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -37,11 +37,16 @@ endif endif # fusion endif # pdk or fusion +PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR := +PDK_PLATFORM_JAVA_ZIP_JAVA_HOST_LIB_DIR := \ + host/common/obj/JAVA_LIBRARIES/bouncycastle-host_intermediates +PDK_PLATFORM_JAVA_ZIP_CONTENTS := + ifneq (,$(filter platform-java, $(MAKECMDGOALS))$(PDK_FUSION_PLATFORM_ZIP)) # additional items to add to platform.zip for platform-java build # For these dirs, add classes.jar and javalib.jar from the dir to platform.zip # all paths under out dir -PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR := \ +PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR += \ target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates \ target/common/obj/JAVA_LIBRARIES/core_intermediates \ target/common/obj/JAVA_LIBRARIES/core-junit_intermediates \ @@ -53,18 +58,18 @@ PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR := \ target/common/obj/JAVA_LIBRARIES/voip-common_intermediates \ target/common/obj/JAVA_LIBRARIES/mms-common_intermediates \ target/common/obj/JAVA_LIBRARIES/android-ex-camera2_intermediates -PDK_PLATFORM_JAVA_ZIP_JAVA_HOST_LIB_DIR := \ - host/common/obj/JAVA_LIBRARIES/bouncycastle-host_intermediates -PDK_PLATFORM_JAVA_ZIP_JAVA_LIB_DIR := \ - $(PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR) \ - $(PDK_PLATFORM_JAVA_ZIP_JAVA_HOST_LIB_DIR) # not java libraries -PDK_PLATFORM_JAVA_ZIP_CONTENTS := \ +PDK_PLATFORM_JAVA_ZIP_CONTENTS += \ target/common/obj/APPS/framework-res_intermediates/package-export.apk \ target/common/obj/APPS/framework-res_intermediates/src/R.stamp +endif # platform-java or FUSION build + +PDK_PLATFORM_JAVA_ZIP_JAVA_LIB_DIR := \ + $(PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR) \ + $(PDK_PLATFORM_JAVA_ZIP_JAVA_HOST_LIB_DIR) + PDK_PLATFORM_JAVA_ZIP_CONTENTS += $(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_LIB_DIR),\ $(lib_dir)/classes.jar $(lib_dir)/javalib.jar) -endif # platform-java or FUSION build # check and override java support level ifneq ($(TARGET_BUILD_PDK)$(PDK_FUSION_PLATFORM_ZIP),) @@ -122,6 +127,11 @@ $(PRODUCT_OUT)/% : $(_pdk_fusion_intermediates)/% $(_pdk_fusion_stamp) $(hide) rm -rf $@ $(hide) cp -fpPR $< $@ +# implicit rules for host java files +$(HOST_COMMON_OUT_ROOT)/% : $(_pdk_fusion_intermediates)/host/common/% $(_pdk_fusion_stamp) + @mkdir -p $(dir $@) + $(hide) cp -fpPR $< $@ + ifeq (true,$(TARGET_BUILD_PDK_JAVA_PLATFORM)) PDK_FUSION_OUT_DIR := $(OUT_DIR) @@ -150,11 +160,6 @@ $(lib_dir)/classes.jar))) $(TARGET_COMMON_OUT_ROOT)/% : $(_pdk_fusion_intermediates)/target/common/% $(_pdk_fusion_stamp) @mkdir -p $(dir $@) $(hide) cp -fpPR $< $@ - -# implicit rules for all other host files -$(HOST_COMMON_OUT_ROOT)/% : $(_pdk_fusion_intermediates)/host/common/% $(_pdk_fusion_stamp) - @mkdir -p $(dir $@) - $(hide) cp -fpPR $< $@ endif ALL_PDK_FUSION_FILES := $(addprefix $(PRODUCT_OUT)/, $(_pdk_fusion_file_list)) |