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

Commit 762614fd authored by Justin Yun's avatar Justin Yun
Browse files

Generate enforce_uses_libraries.status to out/target/product 

enforce_uses_libraries.status files require dexpreopt.config files
which are generated in out/target/product/<product>/obj because they
are specific to target products.
As common files cannot depend on product specific files, generate the
enforce_uses_libraries.status files to the product specific
intermediate directories instead of the common intermediates.

Bug: 279360253
Test: build
Change-Id: Idc468fdaf046cd37dd8f39a9212aad78283b4c61
parent 428f5d59

core/dex_preopt_odex_install.mk

+2 −2
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ ifeq (true,$(LOCAL_ENFORCE_USES_LIBRARIES)) 
    --enforce-uses-libraries-relax,)

  my_dexpreopt_config_args := $(patsubst %,--dexpreopt-config %,$(my_dexpreopt_dep_configs))



  my_enforced_uses_libraries := $(intermediates.COMMON)/enforce_uses_libraries.status

  my_enforced_uses_libraries := $(intermediates)/enforce_uses_libraries.status

  $(my_enforced_uses_libraries): PRIVATE_USES_LIBRARIES := $(my_uses_libs_args)

  $(my_enforced_uses_libraries): PRIVATE_OPTIONAL_USES_LIBRARIES := $(my_optional_uses_libs_args)

  $(my_enforced_uses_libraries): PRIVATE_DEXPREOPT_CONFIGS := $(my_dexpreopt_config_args)
@@ -473,7 +473,7 @@ ifdef LOCAL_DEX_PREOPT 
  my_dexpreopt_deps += $(my_dexpreopt_images_deps)

  my_dexpreopt_deps += $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES)

  ifeq ($(LOCAL_ENFORCE_USES_LIBRARIES),true)

    my_dexpreopt_deps += $(intermediates.COMMON)/enforce_uses_libraries.status

    my_dexpreopt_deps += $(intermediates)/enforce_uses_libraries.status

  endif



  $(my_dexpreopt_zip): PRIVATE_MODULE := $(LOCAL_MODULE)