Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8d7349f authored by Keun-young Park's avatar Keun-young Park
Browse files

PDK: add files necessary to for Java build to platform.zip 

- add second dex to platform.zip
- pull files from .toc files for jack

bug: 26808715, 26510884

Change-Id: I146bd8cd48a19eea88f147331906bd52f34ea790
parent 541a288b

core/pdk_config.mk

+12 −2
Original line number Diff line number Diff line
@@ -79,7 +79,9 @@ PDK_PLATFORM_JAVA_ZIP_JAVA_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.jack $(lib_dir)/classes.jar $(lib_dir)/javalib.jar)

    $(lib_dir)/classes.jack $(lib_dir)/classes.jar $(lib_dir)/classes.jar.toc \

    $(lib_dir)/javalib.jar  $(lib_dir)/classes*.dex \

    $(lib_dir)/classes.dex.toc )



# check and override java support level

ifneq ($(TARGET_BUILD_PDK)$(PDK_FUSION_PLATFORM_ZIP),)
@@ -151,7 +153,7 @@ endif 


define JAVA_dependency_template

$(PDK_FUSION_OUT_DIR)/$(strip $(1)): $(_pdk_fusion_intermediates)/$(strip $(1)) \

  $(PDK_FUSION_OUT_DIR)/$(strip $(2)) $(_pdk_fusion_stamp)

  $(foreach d,$(2),$(PDK_FUSION_OUT_DIR)/$(d)) $(_pdk_fusion_stamp)

	@mkdir -p $$(dir $$@)

	$(hide) cp -fpPR $$< $$@

endef
@@ -166,6 +168,14 @@ $(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR),\ 
$(eval $(call JAVA_dependency_template,$(lib_dir)/javalib.jar,\

$(lib_dir)/classes.jar)))



# pull .jack and .dex files

$(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR),\

  $(eval $(call JAVA_dependency_template,$(lib_dir)/classes.jar.toc,\

    $(lib_dir)/classes.jar $(lib_dir)/classes.jack)))

$(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR),\

  $(eval $(call JAVA_dependency_template,$(lib_dir)/classes.dex.toc,\

    $(filter $(lib_dir)/classes%.dex, $(_pdk_fusion_java_file_list)))))



# implicit rules for all other target files

$(TARGET_COMMON_OUT_ROOT)/% : $(_pdk_fusion_intermediates)/target/common/% $(_pdk_fusion_stamp)

	@mkdir -p $(dir $@)