StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I5dd8d05fb7d2005091e79b32a83c5c80bd34dddd
This commit is contained in:
Ulyana Trafimovich
2021-05-18 13:21:05 +00:00
committed by Automerger Merge Worker
parent 2ee9b4480a 235f1507e9
commit 20a7bfe499
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/dex_preopt_odex_install.mk
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 :=