From ad645285a66289355a109364393b7e6b200ab8da Mon Sep 17 00:00:00 2001 From: Anthony Hugh Date: Fri, 14 May 2021 01:50:11 +0000 Subject: [PATCH] Revert "Revert^2 "Enforce check for Android.mk modules."" This reverts commit b6d1b48f9f2f0c519cdcb0592ef4698e9ad8a346. Reason for revert: This change is breaking seahawk-userdebug BUG: 188108611 Change-Id: I15b737e2778d437ecbef6ab9f43345da407f2205 --- core/dex_preopt_odex_install.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index bcbce8d7a..d925899a6 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -227,9 +227,14 @@ 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 - LOCAL_ENFORCE_USES_LIBRARIES := true + ifneq (,$(strip $(LOCAL_USES_LIBRARIES)$(LOCAL_OPTIONAL_USES_LIBRARIES))) + LOCAL_ENFORCE_USES_LIBRARIES := true + endif endif my_enforced_uses_libraries :=