From e81972289359d52b77ca0ca41436da53a4725652 Mon Sep 17 00:00:00 2001
From: qiaoli <qiaoli@google.com>
Date: Mon, 1 May 2023 21:16:22 +0000
Subject: Allow ODP module to access libtextclassifier_hash_headers library.

Test: mma
Bug: 277775356
Change-Id: Id038036210b9ea9aa216749722d733ebf6e389b7
---
 native/Android.bp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/native/Android.bp b/native/Android.bp
index f482b84..a57df61 100644
--- a/native/Android.bp
+++ b/native/Android.bp
@@ -30,6 +30,7 @@ cc_library_headers {
         "//apex_available:platform",
         "com.android.neuralnetworks",
         "test_com.android.neuralnetworks",
+        "com.android.ondevicepersonalization",
     ],
     min_sdk_version: "apex_inherit",
     sdk_version: "current",
@@ -69,6 +70,7 @@ cc_library_static {
         "test_com.android.neuralnetworks",
         "com.android.extservices",
         "com.android.adservices",
+        "com.android.ondevicepersonalization",
     ],
 }
 
-- 
cgit v1.2.3


From dc6eff193d61657e4c6c6a33daf0808add91986c Mon Sep 17 00:00:00 2001
From: Robert Marcus <ramarcus@google.com>
Date: Mon, 11 Sep 2023 15:07:19 +0000
Subject: Fix module controller for tplus tests

Bug: 287415447
Test: presubmit
Change-Id: I4234adccb4cf359053713d156455777fdc72a6d4
---
 native/AndroidTest-tplus.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/native/AndroidTest-tplus.xml b/native/AndroidTest-tplus.xml
index 3c35ebb..ab2749c 100644
--- a/native/AndroidTest-tplus.xml
+++ b/native/AndroidTest-tplus.xml
@@ -38,7 +38,7 @@
 
     <!-- Prevent tests from running on Android S- -->
     <object type="module_controller"
-            class="com.android.tradefed.testtype.suite.module.Sdk32ModuleController"/>
+            class="com.android.tradefed.testtype.suite.module.Sdk33ModuleController"/>
 
     <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
         <option name="mainline-module-package-name" value="com.google.android.extservices" />
-- 
cgit v1.2.3