commit f17f2eb29490d37cd062951ed988cfb054adaa33
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 16 22:30:51 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 16 22:30:51 2022 +0000
tree d7982b46534c8f770600926a4119593e967eb770
parent b4211c01d01f446bddf4b350ff577cf854781773
parent 43080d9bef7a0fdb71006469fa032721182ac505

Snap for 8736029 from 43080d9bef7a0fdb71006469fa032721182ac505 to mainline-go-networking-release

Change-Id: I53d32a70b7df0318dd915b6fd4367afcbbf4a155

Android.bp

diff --git a/Android.bp b/Android.bp
index d9b1653..b3758f9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,6 +65,7 @@
         "com.android.extservices",
         "com.android.neuralnetworks",
         "test_com.android.neuralnetworks",
+        "com.android.adservices",
     ],
 }
 
@@ -121,3 +122,20 @@
     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",
+    ],
+}

tensorflow/lite/Android.bp

diff --git a/tensorflow/lite/Android.bp b/tensorflow/lite/Android.bp
index a8209a9..98c198b 100644
--- a/tensorflow/lite/Android.bp
+++ b/tensorflow/lite/Android.bp
@@ -152,6 +152,23 @@
     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",
 ]

tensorflow/lite/java/Android.bp

diff --git a/tensorflow/lite/java/Android.bp b/tensorflow/lite/java/Android.bp
index 6c2bb6a..98564b0 100644
--- a/tensorflow/lite/java/Android.bp
+++ b/tensorflow/lite/java/Android.bp
@@ -31,10 +31,14 @@
     ],
     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 @@
         "-Wno-unused-parameter",
     ],
     stl: "libc++_static",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.adservices",
+    ],
 }

tensorflow/lite/tflite_static.bp

diff --git a/tensorflow/lite/tflite_static.bp b/tensorflow/lite/tflite_static.bp
index 071bd88..0bead74 100644
--- a/tensorflow/lite/tflite_static.bp
+++ b/tensorflow/lite/tflite_static.bp
@@ -237,6 +237,7 @@
     apex_available: [
         "//apex_available:platform",
         "com.android.extservices",
+    	"com.android.adservices",
     ],
 }