Snap for 9847922 from 9c7294d755efe3781692c0f03ea0232518168fc1 to mainline-uwb-releaseaml_uwb_331910010aml_uwb_331820070android13-mainline-uwb-release

Change-Id: Ib1769c3a0fedd867b1b4ca0c0b19427059b1f8d0

2 files changed, 68 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index b3758f97097..8e135a3301e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -134,8 +134,73 @@ cc_library_static {
     stl: "libc++",
     srcs: ["tensorflow/lite/experimental/acceleration/configuration/**/*.proto"],
     sdk_version: "current",
-    min_sdk_version: "Tiramisu",
+    min_sdk_version: "30",
     apex_available: [
         "com.android.adservices",
+        "com.android.extservices",
+    ],
+}
+
+filegroup(
+    name = "tensorflow_core_protobuf_src",
+    srcs = [
+        "tensorflow/core/protobuf/bfc_memory_map.proto",
+        "tensorflow/core/protobuf/config.proto",
+        "tensorflow/core/protobuf/cluster.proto",
+        "tensorflow/core/protobuf/debug.proto",
+        "tensorflow/core/protobuf/device_filters.proto",
+        "tensorflow/core/protobuf/device_properties.proto",
+        "tensorflow/core/protobuf/data_service.proto",
+        "tensorflow/core/protobuf/debug_event.proto",
+        "tensorflow/core/protobuf/eager_service.proto",
+        "tensorflow/core/protobuf/graph_debug_info.proto",
+        "tensorflow/core/protobuf/queue_runner.proto",
+        "tensorflow/core/protobuf/rewriter_config.proto",
+        "tensorflow/core/protobuf/tensor_bundle.proto",
+        "tensorflow/core/protobuf/saver.proto",
+        "tensorflow/core/protobuf/verifier_config.proto",
+        "tensorflow/core/protobuf/error_codes.proto",
+        "tensorflow/core/protobuf/composite_tensor_variant.proto",
+        "tensorflow/core/protobuf/master.proto",
+        "tensorflow/core/protobuf/meta_graph.proto",
+        "tensorflow/core/protobuf/named_tensor.proto",
+        "tensorflow/core/protobuf/remote_tensor_handle.proto",
+        "tensorflow/core/protobuf/saved_model.proto",
+        "tensorflow/core/protobuf/saved_object_graph.proto",
+        "tensorflow/core/protobuf/struct.proto",
+        "tensorflow/core/protobuf/worker.proto",
+        "tensorflow/core/protobuf/tensorflow_server.proto",
+        "tensorflow/core/protobuf/trackable_object_graph.proto",
+        "tensorflow/core/protobuf/transport_options.proto",
+        "tensorflow/core/grappler/costs/op_performance_data.proto",
+        "tensorflow/compiler/xla/pjrt/distributed/protocol.proto",
+    ],
+)
+
+java_library_static {
+    name: "tensorflow_core_proto_java_lite",
+    srcs: [
+        "tensorflow/core/framework/*.proto",
+        "tensorflow/core/example/example.proto",
+        "tensorflow/core/example/feature.proto",
+        "tensorflow/core/example/example_parser_configuration.proto",
+        "tensorflow/core/profiler/protobuf/xplane.proto",
+        "tensorflow/core/profiler/profiler_options.proto",
+        "tensorflow/core/util/saved_tensor_slice.proto",
+        "tensorflow/core/util/event.proto",
+        ":tensorflow_core_protobuf_src",
+        ":libprotobuf-internal-protos",
     ],
+    proto: {
+        canonical_path_from_root: false,
+        include_dirs: [
+            "external/protobuf/src",
+            "external/protobuf/java",
+        ],
+        type: "lite",
+    },
+    static_libs: ["libprotobuf-java-lite"],
+    sdk_version: "current",
+    min_sdk_version: "33",
+    apex_available: ["com.android.ondevicepersonalization"],
 }
diff --git a/tensorflow/lite/java/Android.bp b/tensorflow/lite/java/Android.bp
index 98564b01114..bcdab287688 100644
--- a/tensorflow/lite/java/Android.bp
+++ b/tensorflow/lite/java/Android.bp
@@ -38,6 +38,7 @@ java_library_static {
     apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
+        "com.android.extservices",
     ],
 }
 
@@ -71,5 +72,6 @@ cc_library_shared {
     apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
+        "com.android.extservices",
     ],
 }