p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Ulyana Trafimovich 2021-05-13 16:23:31 +00:00 committed by Android (Google) Code Review
parent 57f255301f b6d1b48f9f
commit aeb62e4cbd
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/dex_preopt_odex_install.mk
View File

@ -227,15 +227,10 @@ 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 # Verify LOCAL_USES_LIBRARIES/LOCAL_OPTIONAL_USES_LIBRARIES against the manifest.
# 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))