commit 05a357b1599ddae5c5b0de9cdb9d9a75f5431356
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Dec 02 02:20:31 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Dec 02 02:20:31 2023 +0000
tree a3fd6ff34796ce3f4a9dc6ac9285d0af3a50f6e9
parent 47ed4a1e61812d2ab7582f5fa0d3edcc9602d638
parent 39084695b3b17c8986b60a9ac2c83814dae111e1

Snap for 11169761 from 39084695b3b17c8986b60a9ac2c83814dae111e1 to 24Q1-release

Change-Id: Icb0960f9516427752b410b162f7b54b2eaaf618b

Android.bp

diff --git a/Android.bp b/Android.bp
index 8a3557c..c706ba4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -83,7 +83,7 @@
         "ExtServices-core",
     ],
     jarjar_rules: "jarjar-rules.txt",
-    jni_libs: ["libtextclassifier", "libextservices_jni"],
+    jni_libs: ["libtextclassifier", "libextservices_jni", "libhpke_jni"],
     use_embedded_native_libs: true,
     apex_available: [
         "//apex_available:platform",
@@ -110,7 +110,7 @@
         "AdServices-core",
     ],
     jarjar_rules: "jarjar-rules.txt",
-    jni_libs: ["libtextclassifier", "libextservices_jni"],
+    jni_libs: ["libtextclassifier", "libextservices_jni", "libhpke_jni"],
     libs: ["android.ext.adservices"],
     optional_uses_libs: ["android.ext.adservices"],
     use_embedded_native_libs: true,

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 8865a61..1cc1c45 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -36,7 +36,7 @@
     defaults: ["com.android.extservices-defaults"],
     apps: ["ExtServices-sminus"],
     java_libs: ["android.ext.adservices"],
-    jni_libs: ["libtflite_support_classifiers_native", "libhpke_jni"],
+    jni_libs: ["libtflite_support_classifiers_native"],
 }
 
 apex_defaults {