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

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

Change-Id: Ia571ca3332922c57e89e17ca81caf3e8ce6decee
This commit is contained in:
Ulyana Trafimovich 2021-05-14 16:44:39 +00:00 committed by Automerger Merge Worker
commit 0858cc2c86
1 changed files with 2 additions and 7 deletions

View File

@ -227,14 +227,9 @@ 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
# 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.
# Verify LOCAL_USES_LIBRARIES/LOCAL_OPTIONAL_USES_LIBRARIES against the manifest.
ifndef LOCAL_ENFORCE_USES_LIBRARIES
ifneq (,$(strip $(LOCAL_USES_LIBRARIES)$(LOCAL_OPTIONAL_USES_LIBRARIES)))
LOCAL_ENFORCE_USES_LIBRARIES := true
endif
LOCAL_ENFORCE_USES_LIBRARIES := true
endif
my_enforced_uses_libraries :=