commit 8b02856f97e3f8a6395dc5d1d10aaa84d90a8f5c
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 14 20:52:46 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 14 20:52:46 2021 +0000
tree c8ef04197127bce92b06fdd632cdc27b3d862cf6
parent ff4544ceb446ea0ed1cdae6d309b1f8bfeb3aa14
parent de1e64c7fd057f4d9939cc6692d557b9f42ffeae

Merge "Reland: Enable verity computation on VABC devices" am: de1e64c7fd

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

Change-Id: I772e57ff6ed41569d2a6cfd6ac9bfdb9d109e792

core/dex_preopt_odex_install.mk

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