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

Commit 4f2133e3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "manifest_check.py: translate library names using dexpreopt configs." am: 389f95dc 

Original change: https://android-review.googlesource.com/c/platform/build/+/1620976

Change-Id: Ic760dc00446416232e0cd032b96107cf75bf9daa
parents c47dc3d4 389f95dc

core/dex_preopt_odex_install.mk

+5 −0
Original line number Diff line number Diff line
@@ -220,12 +220,16 @@ ifeq (true,$(LOCAL_ENFORCE_USES_LIBRARIES)) 
    $(LOCAL_OPTIONAL_USES_LIBRARIES))

  my_relax_check_arg := $(if $(filter true,$(RELAX_USES_LIBRARY_CHECK)), \

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

  $(my_enforced_uses_libraries): PRIVATE_RELAX_CHECK := $(my_relax_check_arg)

  $(my_enforced_uses_libraries): $(AAPT)

  $(my_enforced_uses_libraries): $(my_verify_script)

  $(my_enforced_uses_libraries): $(my_dexpreopt_dep_configs)

  $(my_enforced_uses_libraries): $(my_manifest_or_apk)

	@echo Verifying uses-libraries: $<

	rm -f $@
@@ -235,6 +239,7 @@ ifeq (true,$(LOCAL_ENFORCE_USES_LIBRARIES)) 
	  --aapt $(AAPT) \

	  $(PRIVATE_USES_LIBRARIES) \

	  $(PRIVATE_OPTIONAL_USES_LIBRARIES) \

	  $(PRIVATE_DEXPREOPT_CONFIGS) \

	  $(PRIVATE_RELAX_CHECK) \

	  $<

  $(built_module) : $(my_enforced_uses_libraries)