commit 47bebaca8b0eeaeec70c6cd66ee0da4791e4855f
author Anton Hansson <hansson@google.com> Tue Jun 15 10:08:03 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 15 10:08:03 2021 +0000
tree 1607b80504445e86556a16ee0edbbac7e9c9c52e
parent 61a1d6d7a314a94f491a9d1979d4c4594d4ae142
parent 757e2e1fc10d92ceae13d653c2e93ebd571e5a68

Merge "Add help message for likely typo to lunch" am: 757e2e1fc1

Original change: https://android-review.googlesource.com/c/platform/build/+/1736893

Change-Id: I3ed2ca1d5f2039f955db4f6d5a1401b4e7b307b8

core/dex_preopt_odex_install.mk

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