Snap for 8736029 from 43080d9bef7a0fdb71006469fa032721182ac505 to mainline-go-mediaprovider-releaseaml_go_mpr_330912000android13-mainline-go-mediaprovider-release

Change-Id: I95ae824f5668aa0c6c0b06f006d08beebf635fa5

4 files changed, 45 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index d9b16535b53..b3758f97097 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,6 +65,7 @@ cc_library_headers {
         "com.android.extservices",
         "com.android.neuralnetworks",
         "test_com.android.neuralnetworks",
+        "com.android.adservices",
     ],
 }
 
@@ -121,3 +122,20 @@ cc_library_static {
     sdk_version: "current",
     stl: "c++_static",
 }
+
+
+cc_library_static {
+    name: "tflite_configuration_proto",
+    proto: {
+        type: "lite",
+        canonical_path_from_root: false,
+        export_proto_headers: true,
+    },
+    stl: "libc++",
+    srcs: ["tensorflow/lite/experimental/acceleration/configuration/**/*.proto"],
+    sdk_version: "current",
+    min_sdk_version: "Tiramisu",
+    apex_available: [
+        "com.android.adservices",
+    ],
+}
diff --git a/tensorflow/lite/Android.bp b/tensorflow/lite/Android.bp
index a8209a99ffa..98c198b7bcb 100644
--- a/tensorflow/lite/Android.bp
+++ b/tensorflow/lite/Android.bp
@@ -152,6 +152,23 @@ cc_library_shared {
     stl: "libc++_static",
 }
 
+cc_library_static {
+    name: "tflite_mutable_op_resolver",
+    defaults: ["tflite_defaults"],
+    srcs: [
+        "mutable_op_resolver.cc"
+    ],
+    header_libs: [
+        "flatbuffer_headers",
+    ],
+    stl: "libc++",
+    sdk_version: "current",
+    min_sdk_version: "30",
+    apex_available: [
+        "com.android.adservices",
+    ],
+}
+
 build = [
     "tflite_static.bp",
 ]
diff --git a/tensorflow/lite/java/Android.bp b/tensorflow/lite/java/Android.bp
index 6c2bb6a624a..98564b01114 100644
--- a/tensorflow/lite/java/Android.bp
+++ b/tensorflow/lite/java/Android.bp
@@ -31,10 +31,14 @@ java_library_static {
     ],
     srcs: [
         ":tflite_nnapi_delegate_java",
-        "src/main/java/org/tensorflow/lite/*.java",
+        "src/main/java/org/tensorflow/lite/**/*.java",
     ],
     static_libs: [
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.adservices",
+    ],
 }
 
 cc_library_shared {
@@ -64,4 +68,8 @@ cc_library_shared {
         "-Wno-unused-parameter",
     ],
     stl: "libc++_static",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.adservices",
+    ],
 }
diff --git a/tensorflow/lite/tflite_static.bp b/tensorflow/lite/tflite_static.bp
index 071bd8863be..0bead74ecb7 100644
--- a/tensorflow/lite/tflite_static.bp
+++ b/tensorflow/lite/tflite_static.bp
@@ -237,6 +237,7 @@ cc_library_static {
     apex_available: [
         "//apex_available:platform",
         "com.android.extservices",
+    	"com.android.adservices",
     ],
 }