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

Commit 585ec03c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "soong-java-install" 

* changes:
  Move java install rules into Soong
  Don't create compatibility suite copy rules for installed path
parents 0e21221d 47cfffea

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -766,6 +766,9 @@ $(call add-clean-step, rm -rf $(SOONG_HOST_OUT)) 
# More of SOONG_HOST_OUT_EXECUTABLES has been moved to HOST_OUT_EXECUTABLES

$(call add-clean-step, rm -rf $(SOONG_HOST_OUT))



# More of SOONG_HOST_OUT_EXECUTABLES has been moved to HOST_OUT_EXECUTABLES

$(call add-clean-step, rm -rf $(SOONG_HOST_OUT))



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/base_rules.mk

+8 −15
Original line number Diff line number Diff line
@@ -514,12 +514,6 @@ my_path_comp := 
###########################################################



my_installed_symlinks :=

my_default_test_module :=

ifeq ($(use_testcase_folder),true)

arch_dir := $($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)

my_default_test_module := $($(my_prefix)OUT_TESTCASES)/$(LOCAL_MODULE)/$(arch_dir)/$(my_installed_module_stem)

arch_dir :=

endif



ifneq (,$(LOCAL_SOONG_INSTALLED_MODULE))

  # Soong already generated the copy rule, but make the installed location depend on the Make
@@ -531,7 +525,6 @@ ifneq (,$(LOCAL_SOONG_INSTALLED_MODULE)) 
    $(call declare-0p-target,$(symlink)))

  $(my_all_targets) : | $(LOCAL_SOONG_INSTALL_SYMLINKS)

else ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))

  ifneq ($(LOCAL_INSTALLED_MODULE),$(my_default_test_module))

  $(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)

  $(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)

	@echo "Install: $@"
@@ -541,7 +534,6 @@ else ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) 
	$(copy-file-to-new-target)

  endif

	$(PRIVATE_POST_INSTALL_CMD)

  endif



  # Rule to install the module's companion symlinks

  my_installed_symlinks := $(addprefix $(my_module_path)/,$(LOCAL_MODULE_SYMLINKS) $(LOCAL_MODULE_SYMLINKS_$(my_32_64_bit_suffix)))
@@ -739,8 +731,9 @@ endif 


# The module itself.

$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

  $(eval my_compat_dist_$(suite) := $(foreach dir, $(call compatibility_suite_dirs,$(suite),$(arch_dir)), \

    $(LOCAL_BUILT_MODULE):$(dir)/$(my_installed_module_stem))) \

  $(eval my_compat_dist_$(suite) := $(patsubst %:$(LOCAL_INSTALLED_MODULE),$(LOCAL_INSTALLED_MODULE):$(LOCAL_INSTALLED_MODULE),\

    $(foreach dir, $(call compatibility_suite_dirs,$(suite),$(arch_dir)), \

      $(LOCAL_BUILT_MODULE):$(dir)/$(my_installed_module_stem)))) \

  $(eval my_compat_dist_config_$(suite) := ))

core/soong_app_prebuilt.mk

+0 −7
Original line number Diff line number Diff line
@@ -138,13 +138,6 @@ endif # LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE 
java-dex: $(LOCAL_SOONG_DEX_JAR)





my_built_installed := $(foreach f,$(LOCAL_SOONG_BUILT_INSTALLED),\

  $(call word-colon,1,$(f)):$(PRODUCT_OUT)$(call word-colon,2,$(f)))

my_installed := $(call copy-many-files, $(my_built_installed))

ALL_MODULES.$(my_register_name).INSTALLED += $(my_installed)

ALL_MODULES.$(my_register_name).BUILT_INSTALLED += $(my_built_installed)

$(my_all_targets): $(my_installed)



# Copy test suite files.

ifdef LOCAL_COMPATIBILITY_SUITE

my_apks_to_install := $(foreach f,$(filter %.apk %.idsig,$(LOCAL_SOONG_BUILT_INSTALLED)),$(call word-colon,1,$(f)))

core/soong_java_prebuilt.mk

+0 −6
Original line number Diff line number Diff line
@@ -154,13 +154,7 @@ else # LOCAL_SOONG_DEX_JAR 
  endif

endif  # LOCAL_SOONG_DEX_JAR



my_built_installed := $(foreach f,$(LOCAL_SOONG_BUILT_INSTALLED),\

  $(call word-colon,1,$(f)):$(PRODUCT_OUT)$(call word-colon,2,$(f)))

my_installed := $(call copy-many-files, $(my_built_installed))

ALL_MODULES.$(my_register_name).INSTALLED += $(my_installed)

ALL_MODULES.$(my_register_name).BUILT_INSTALLED += $(my_built_installed)

ALL_MODULES.$(my_register_name).CLASSES_JAR := $(full_classes_jar)

$(my_register_name): $(my_installed)



ifdef LOCAL_SOONG_AAR

  ALL_MODULES.$(my_register_name).AAR := $(LOCAL_SOONG_AAR)