From d1d8c7133ca266f7d6b58d83c4d9f75add52fc51 Mon Sep 17 00:00:00 2001 From: Ulyana Trafimovich Date: Mon, 17 May 2021 09:36:52 +0000 Subject: [PATCH] Revert^6 "Enforce check for Android.mk modules." This reverts commit 80e99d88514e7b0cff692fafdcccbb4739e918da. Reason for revert: relanding CL after fixing barbet-userdebug build. Bug: 132357300 Change-Id: I4b8e22847215b349393f01f6c0a90dd03b6073cd Test: on branch sc-dev: lunch barbet-userdebug && m --- 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 :=