commit ff4544ceb446ea0ed1cdae6d309b1f8bfeb3aa14
author Jaewoong Jung <jungjw@google.com> Fri May 14 14:31:22 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 14 14:31:22 2021 +0000
tree c750d69aa37fb9d2c6461a2e598b0f14ff07e7be
parent 19b49a7b376a74d5cb08ca07f115737c62cd0cb3
parent 3218d79aa702b1f9dcc5fdf193a8aed9b2fb8938

Merge "Do not alter presigned prebuilt apks for SDK > 29." am: 3218d79aa7

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

Change-Id: Ibb6585eca9474b783762343f0ab9f9302a7becb0

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