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

Commit 47cfffea authored by Colin Cross's avatar Colin Cross
Browse files

Move java install rules into Soong 

Remove the copy rules for LOCAL_SOONG_BUILT_INSTALLED, they will already
be created by Soong.

Also clean the soong host tools directory to remove any old copies of
java binaries.

Bug: 204136549
Test: m checkbuild
Change-Id: Ib6b5362ad59aa48770e48541430d6857846926c2
parent a69b8094

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/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)