From feeb6bcd1ec21cc3553fea3863c33a05c1faf2ba Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Wed, 7 Apr 2021 14:06:17 +0100 Subject: [PATCH] Enforce check for Android.mk modules. Bug: 132357300 Test: treehugger Change-Id: If31a9ed148e4f1195bf916a650d0afafef3d6915 --- core/dex_preopt_odex_install.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index d925899a60..bcbce8d7af 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -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 :=