commit 6f29441e37efd98b353c08ffa7f0c9e41ac98617
author Yingzhe Li <yingzheli@google.com> Fri May 31 23:09:13 2024 +0000
committer Yingzhe Li <yingzheli@google.com> Fri May 31 23:56:05 2024 +0000
tree 61160ce358bcff92652bf737cca1b9e6ab7e51e6
parent 26bb2346de82aa566537131ae25ef16482bb833e

Enable <uses-library> check for WTS

<uses-library> checks are disabled on test suites by default. There were
changes merged in WTS that broke regular device build due to the lack of
this check in WTS.

This change adds such check to WTS.

Bug: 341311669

Test: m wts; verifies <uses-library> check is executed
Change-Id: Iafb10c15cf3569c500c46354f81325f0d834e0aa

core/dex_preopt_odex_install.mk

diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index 151591e..08e2da3 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -202,6 +202,12 @@
 endif
 ifneq (,$(LOCAL_COMPATIBILITY_SUITE))
   LOCAL_ENFORCE_USES_LIBRARIES := false
+
+  # Enable the check for WTS
+  ifneq ($(filter wts,$(LOCAL_COMPATIBILITY_SUITE)),)
+    LOCAL_ENFORCE_USES_LIBRARIES := true
+  endif
+
 endif
 
 # Disable the check if the app contains no java code.