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

Commit 83b7bdf7 authored by Colin Cross's avatar Colin Cross
Browse files

Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk 

Simplify importing Soong modules into Make by always copying
LOCAL_PREBUILT_MODULE_FILE to LOCAL_BUILT_MODULE, which lets
Soong pick the final output file instead of trying to figure
out which of the various intermediate files should be the
output file.

Also fixes an issue where hostdex modules could attempt to
copy to both $(common_javalib.jar) and $(LOCAL_BUILT_MODULE),
which are the same file for host java modules.

Test: set compile_dex:true on core.platform.api.stubs. no warnings
      of target overriding
Test: m checkbuild

Change-Id: I2e089012436fe8649db82a673d446d1c5a73a731
parent 85437e24

core/soong_app_prebuilt.mk

+36 −34
Original line number Original line Diff line number Diff line
@@ -27,8 +27,42 @@ full_classes_jar := $(intermediates.COMMON)/classes.jar 
full_classes_pre_proguard_jar := $(intermediates.COMMON)/classes-pre-proguard.jar

full_classes_pre_proguard_jar := $(intermediates.COMMON)/classes-pre-proguard.jar

full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar

full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar





ifdef LOCAL_SOONG_CLASSES_JAR

  $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_jar)))

  $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_jar)))

  $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_pre_proguard_jar)))

  $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_pre_proguard_jar)))

  $(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(full_classes_jar)))



  ifneq ($(TURBINE_ENABLED),false)

    ifdef LOCAL_SOONG_HEADER_JAR

      $(eval $(call copy-one-file,$(LOCAL_SOONG_HEADER_JAR),$(full_classes_header_jar)))

    else

      $(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar)))

    endif

  endif # TURBINE_ENABLED != false

endif



# Run veridex on product, product_services and vendor modules.

# We skip it for unbundled app builds where we cannot build veridex.

module_run_appcompat :=

ifeq (true,$(filter true, \

   $(LOCAL_PRODUCT_MODULE) $(LOCAL_PRODUCT_SERVICES_MODULE) \

   $(LOCAL_VENDOR_MODULE) $(LOCAL_PROPRIETARY_MODULE)))

ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))  # ! unbundled app build

  module_run_appcompat := true

endif

endif



ifeq ($(module_run_appcompat),true)

  $(LOCAL_BUILT_MODULE): $(appcompat-files)

  $(LOCAL_BUILT_MODULE): PRIVATE_INSTALLED_MODULE := $(LOCAL_INSTALLED_MODULE)

  $(LOCAL_BUILT_MODULE): $(LOCAL_PREBUILT_MODULE_FILE)

	@echo "Copy: $@"

	$(copy-file-to-target)

	$(call appcompat-header, aapt2)

	$(run-appcompat)

else

  $(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))

endif





ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR

ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR

  $(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\

  $(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\
@@ -44,15 +78,6 @@ ifdef LOCAL_SOONG_PROGUARD_DICT 
    $(intermediates.COMMON)/proguard_dictionary)

    $(intermediates.COMMON)/proguard_dictionary)

endif

endif





ifneq ($(TURBINE_ENABLED),false)

ifdef LOCAL_SOONG_HEADER_JAR

$(eval $(call copy-one-file,$(LOCAL_SOONG_HEADER_JAR),$(full_classes_header_jar)))

else

$(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar)))

endif

endif # TURBINE_ENABLED != false





ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE

ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE

resource_export_package := $(intermediates.COMMON)/package-export.apk

resource_export_package := $(intermediates.COMMON)/package-export.apk

resource_export_stamp := $(intermediates.COMMON)/src/R.stamp

resource_export_stamp := $(intermediates.COMMON)/src/R.stamp
@@ -74,29 +99,6 @@ ifneq ($(BUILD_PLATFORM_ZIP),) 
  $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(dir $(LOCAL_BUILT_MODULE))package.dex.apk))

  $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(dir $(LOCAL_BUILT_MODULE))package.dex.apk))

endif

endif





# Run veridex on product, product_services and vendor modules.

# We skip it for unbundled app builds where we cannot build veridex.

module_run_appcompat :=

ifeq (true,$(filter true, \

   $(LOCAL_PRODUCT_MODULE) $(LOCAL_PRODUCT_SERVICES_MODULE) \

   $(LOCAL_VENDOR_MODULE) $(LOCAL_PROPRIETARY_MODULE)))

ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))  # ! unbundled app build

  module_run_appcompat := true

endif

endif



ifeq ($(module_run_appcompat),true)

  $(LOCAL_BUILT_MODULE): $(appcompat-files)

  $(LOCAL_BUILT_MODULE): PRIVATE_INSTALLED_MODULE := $(LOCAL_INSTALLED_MODULE)

  $(LOCAL_BUILT_MODULE): $(LOCAL_PREBUILT_MODULE_FILE)

	@echo "Copy: $@"

	$(copy-file-to-target)

	$(call appcompat-header, aapt2)

	$(run-appcompat)

else

  $(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))

endif



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

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

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

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

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

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

core/soong_java_prebuilt.mk

+33 −44
Original line number Original line Diff line number Diff line
@@ -24,8 +24,21 @@ common_javalib.jar := $(intermediates.COMMON)/javalib.jar 
hiddenapi_flags_csv := $(intermediates.COMMON)/hiddenapi/flags.csv

hiddenapi_flags_csv := $(intermediates.COMMON)/hiddenapi/flags.csv

hiddenapi_metadata_csv := $(intermediates.COMMON)/hiddenapi/greylist.csv

hiddenapi_metadata_csv := $(intermediates.COMMON)/hiddenapi/greylist.csv





ifdef LOCAL_SOONG_CLASSES_JAR

  $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_jar)))

  $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_jar)))

  $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_pre_proguard_jar)))

  $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_pre_proguard_jar)))

  $(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(full_classes_jar)))



  ifneq ($(TURBINE_ENABLED),false)

    ifdef LOCAL_SOONG_HEADER_JAR

      $(eval $(call copy-one-file,$(LOCAL_SOONG_HEADER_JAR),$(full_classes_header_jar)))

    else

      $(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar)))

    endif

  endif # TURBINE_ENABLED != false

endif



$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))





ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR

ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR

  $(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\

  $(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\
@@ -64,14 +77,6 @@ ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE 
  $(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_static_library_android_manifest))

  $(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_static_library_android_manifest))

endif # LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE

endif # LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE





ifneq ($(TURBINE_ENABLED),false)

ifdef LOCAL_SOONG_HEADER_JAR

$(eval $(call copy-one-file,$(LOCAL_SOONG_HEADER_JAR),$(full_classes_header_jar)))

else

$(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar)))

endif

endif # TURBINE_ENABLED != false







ifdef LOCAL_SOONG_DEX_JAR

ifdef LOCAL_SOONG_DEX_JAR

  # Hidden API for boot jars

  # Hidden API for boot jars
@@ -83,12 +88,7 @@ ifdef LOCAL_SOONG_DEX_JAR 
      # java.mk.

      # java.mk.

      $(eval $(call hiddenapi-generate-csv,$(full_classes_jar),$(hiddenapi_flags_csv),$(hiddenapi_metadata_csv)))

      $(eval $(call hiddenapi-generate-csv,$(full_classes_jar),$(hiddenapi_flags_csv),$(hiddenapi_metadata_csv)))

      $(eval $(call hiddenapi-copy-soong-jar,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))

      $(eval $(call hiddenapi-copy-soong-jar,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))

    endif

  endif





  ifneq ($(LOCAL_UNINSTALLABLE_MODULE),true)

    ifndef LOCAL_IS_HOST_MODULE

      ifneq ($(filter $(LOCAL_MODULE),$(PRODUCT_BOOT_JARS)),)  # is_boot_jar

      ifeq (true,$(WITH_DEXPREOPT))

      ifeq (true,$(WITH_DEXPREOPT))

        # For libart, the boot jars' odex files are replaced by $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE).

        # For libart, the boot jars' odex files are replaced by $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE).

        # We use this installed_odex trick to get boot.art installed.

        # We use this installed_odex trick to get boot.art installed.
@@ -102,17 +102,9 @@ ifdef LOCAL_SOONG_DEX_JAR 
    else # !is_boot_jar

    else # !is_boot_jar

      $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))

      $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))

    endif # is_boot_jar

    endif # is_boot_jar

      $(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar) $(full_classes_header_jar)))





      $(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))

    $(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(common_javalib.jar)))

    $(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(common_javalib.jar)))

    else # LOCAL_IS_HOST_MODULE

    $(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar) $(full_classes_header_jar)))

      $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(LOCAL_BUILT_MODULE)))

      $(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(full_classes_jar) $(full_classes_header_jar)))

    endif



    java-dex : $(LOCAL_BUILT_MODULE)

  else  # LOCAL_UNINSTALLABLE_MODULE





    ifneq ($(filter $(LOCAL_MODULE),$(HIDDENAPI_EXTRA_APP_USAGE_JARS)),)

    ifneq ($(filter $(LOCAL_MODULE),$(HIDDENAPI_EXTRA_APP_USAGE_JARS)),)

      # Derive greylist from classes.jar.

      # Derive greylist from classes.jar.
@@ -121,18 +113,15 @@ ifdef LOCAL_SOONG_DEX_JAR 
      # java.mk.

      # java.mk.

      $(eval $(call hiddenapi-generate-csv,$(full_classes_jar),$(hiddenapi_flags_csv),$(hiddenapi_metadata_csv)))

      $(eval $(call hiddenapi-generate-csv,$(full_classes_jar),$(hiddenapi_flags_csv),$(hiddenapi_metadata_csv)))

    endif

    endif

  endif





    $(eval $(call copy-one-file,$(full_classes_jar),$(LOCAL_BUILT_MODULE)))

  java-dex : $(LOCAL_BUILT_MODULE)

    $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))

    java-dex : $(common_javalib.jar)

  endif  # LOCAL_UNINSTALLABLE_MODULE

else  # LOCAL_SOONG_DEX_JAR

else  # LOCAL_SOONG_DEX_JAR

  ifndef LOCAL_UNINSTALLABLE_MODULE

  ifndef LOCAL_UNINSTALLABLE_MODULE

    ifndef LOCAL_IS_HOST_MODULE

    ifndef LOCAL_IS_HOST_MODULE

      $(call pretty-error,Installable device module must have LOCAL_SOONG_DEX_JAR set)

      $(call pretty-error,Installable device module must have LOCAL_SOONG_DEX_JAR set)

    endif

    endif

  endif

  endif

  $(eval $(call copy-one-file,$(full_classes_jar),$(LOCAL_BUILT_MODULE)))

endif  # LOCAL_SOONG_DEX_JAR

endif  # LOCAL_SOONG_DEX_JAR





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

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