commit ae6bdc0c747ed4a7fdd831ac4fa1add5a9df5e63
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 13 12:31:44 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 13 12:31:44 2021 +0000
tree e5500e0a0f68002069dc1dbc7a176a9ed7ddf92a
parent 26bad544c52bce992368ca11139ad614cf4d048f
parent 7ceafdaf347937aba2df26f52dd53f20d4e5d853

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

core/dex_preopt_odex_install.mk

diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index d925899..bcbce8d 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -227,14 +227,9 @@
   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 :=