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

Commit 8abb26f6 authored by Anthony Hugh's avatar Anthony Hugh Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert^2 "Enforce <uses-library> check for Android.mk... 

Merge "Revert "Revert^2 "Enforce <uses-library> check for Android.mk modules.""" into sc-dev am: b961222c

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

Change-Id: I9f48771d33e40bc48c54d37cb8fc4bb1ac8b38c8
parents 09233ccd b961222c

core/dex_preopt_odex_install.mk

+7 −2
Original line number Original line Diff line number Diff line
@@ -227,10 +227,15 @@ else ifeq (true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY)) 
  LOCAL_ENFORCE_USES_LIBRARIES := false

  LOCAL_ENFORCE_USES_LIBRARIES := false

endif

endif





# Verify LOCAL_USES_LIBRARIES/LOCAL_OPTIONAL_USES_LIBRARIES against the manifest.

# Verify LOCAL_USES_LIBRARIES/LOCAL_OPTIONAL_USES_LIBRARIES

# If LOCAL_ENFORCE_USES_LIBRARIES is not set, default to true if either of LOCAL_USES_LIBRARIES or

# LOCAL_OPTIONAL_USES_LIBRARIES are specified.

# Will change the default to true unconditionally in the future.

ifndef LOCAL_ENFORCE_USES_LIBRARIES

ifndef LOCAL_ENFORCE_USES_LIBRARIES

  ifneq (,$(strip $(LOCAL_USES_LIBRARIES)$(LOCAL_OPTIONAL_USES_LIBRARIES)))

    LOCAL_ENFORCE_USES_LIBRARIES := true

    LOCAL_ENFORCE_USES_LIBRARIES := true

  endif

  endif

endif





my_enforced_uses_libraries :=

my_enforced_uses_libraries :=

ifeq (true,$(LOCAL_ENFORCE_USES_LIBRARIES))

ifeq (true,$(LOCAL_ENFORCE_USES_LIBRARIES))