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

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

Change-Id: Ia28186d2c1c4e446c5d870aa416fa6e0c478a097
This commit is contained in:
Anthony Hugh 2021-05-14 05:03:12 +00:00 committed by Automerger Merge Worker
commit 2588484fa1
1 changed files with 7 additions and 2 deletions

View File

@ -227,10 +227,15 @@ else ifeq (true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY))
LOCAL_ENFORCE_USES_LIBRARIES := false
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
ifneq (,$(strip $(LOCAL_USES_LIBRARIES)$(LOCAL_OPTIONAL_USES_LIBRARIES)))
LOCAL_ENFORCE_USES_LIBRARIES := true
endif
endif
my_enforced_uses_libraries :=
ifeq (true,$(LOCAL_ENFORCE_USES_LIBRARIES))