diff options
| author | Colin Cross <ccross@android.com> | 2013-12-17 12:06:59 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2013-12-17 12:06:59 -0800 |
| commit | 074d8385908f3d37f57cdc08b8248bbdf0f97c80 (patch) | |
| tree | cd8b5e895c9ebda5f84ebb20030caa9b54a4a4a0 /core/pdk_config.mk | |
| parent | bc7064b5069955a271e56caa28ebc605140d0ca3 (diff) | |
| download | build-074d8385908f3d37f57cdc08b8248bbdf0f97c80.zip build-074d8385908f3d37f57cdc08b8248bbdf0f97c80.tar.gz build-074d8385908f3d37f57cdc08b8248bbdf0f97c80.tar.bz2 | |
pdk: add bouncycastle-host javalib.jar to platform.zip
Add javalib.jar from bouncycastle-host to the platform.zip to allow
building dumpkey.jar, which is necessary to build recovery.
Host java libraries have no classes.jar, so they have to be kept
in a separate list fromt target java libraries. Also add an implicit
rule to copy the host files out of the pdk fusion intermediates.
Bug: 12186985
Change-Id: I03ddf9810bc7a4ef7aac8427c4607d9eea27cc6b
Diffstat (limited to 'core/pdk_config.mk')
| -rw-r--r-- | core/pdk_config.mk | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/core/pdk_config.mk b/core/pdk_config.mk index 9590d70..886835c 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -41,7 +41,7 @@ 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_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,6 +53,11 @@ PDK_PLATFORM_JAVA_ZIP_JAVA_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 := \ target/common/obj/APPS/framework-res_intermediates/package-export.apk \ @@ -137,14 +142,19 @@ target/common/obj/APPS/framework-res_intermediates/src/R.stamp,\ target/common/obj/APPS/framework-res_intermediates/package-export.apk)) # javalib.jar should pull classes.jar as classes.jar is not explicitly pulled. -$(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_LIB_DIR),\ +$(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR),\ $(eval $(call JAVA_dependency_template,$(lib_dir)/javalib.jar,\ $(lib_dir)/classes.jar))) -# implicit rules for all others +# implicit rules for all other target files $(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)) |