commit 61a1d6d7a314a94f491a9d1979d4c4594d4ae142
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 14 18:58:47 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 14 18:58:47 2021 +0000
tree ba89f0c216227807bff3baed7df0f096677c1abb
parent b04140fce239050ef0c2bee05c4dec0b0f71b44b
parent c09cda8c6c0714499defd1f8e3019adf917169d0

Merge "Add ro.vendor.build.dont_use_vabc to disable VABC OTA" am: c09cda8c6c

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

Change-Id: I97143fdf5e4239085aa0e3581c79a640a1166745

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 :=