Snap for 8730993 from ceacdee3b5b6a0ee501026fe7f3d8072685da986 to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010

Change-Id: Iadacf53afcdc408d6408743b152f3545e9c103d7

5 files changed, 3 insertions, 53 deletions

diff --git a/Android.bp b/Android.bp
index b3758f97097..d9b16535b53 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,7 +65,6 @@ cc_library_headers {
         "com.android.extservices",
         "com.android.neuralnetworks",
         "test_com.android.neuralnetworks",
-        "com.android.adservices",
     ],
 }
 
@@ -122,20 +121,3 @@ 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 98c198b7bcb..120cbe9a326 100644
--- a/tensorflow/lite/Android.bp
+++ b/tensorflow/lite/Android.bp
@@ -54,6 +54,7 @@ cc_library_static {
 cc_library_static {
     name: "libtflite_framework",
     defaults: ["tflite_defaults"],
+    rtti: true,
     srcs: [
         "allocation.cc",
         "arena_planner.cc",
@@ -152,23 +153,6 @@ 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/delegates/nnapi/TEST_MAPPING b/tensorflow/lite/delegates/nnapi/TEST_MAPPING
index ca9065e47bf..e304f92d66c 100644
--- a/tensorflow/lite/delegates/nnapi/TEST_MAPPING
+++ b/tensorflow/lite/delegates/nnapi/TEST_MAPPING
@@ -3,10 +3,5 @@
     {
       "name": "CtsTfliteNnapiDelegateTestCases"
     }
-  ],
-  "hwasan-postsubmit": [
-    {
-      "name": "CtsTfliteNnapiDelegateTestCases"
-    }
   ]
 }
diff --git a/tensorflow/lite/java/Android.bp b/tensorflow/lite/java/Android.bp
index 98564b01114..833c3b05a26 100644
--- a/tensorflow/lite/java/Android.bp
+++ b/tensorflow/lite/java/Android.bp
@@ -24,27 +24,21 @@ package {
 java_library_static {
     name: "tensorflowlite_java",
     sdk_version: "current",
-    min_sdk_version: "30",
     libs: [
         "android-support-annotations",
         "guava-android-annotation-stubs",
     ],
     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 {
     name: "libtensorflowlite_jni",
     sdk_version: "current",
-    min_sdk_version: "30",
     export_include_dirs: [
         "src/main/native/",
     ],
@@ -68,8 +62,4 @@ 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 0bead74ecb7..178f6778ab3 100644
--- a/tensorflow/lite/tflite_static.bp
+++ b/tensorflow/lite/tflite_static.bp
@@ -19,6 +19,7 @@ cc_library_static {
     vendor_available: true,
     sdk_version: "current",
     min_sdk_version: "30",
+    rtti: true,
     srcs: [
         "allocation.cc",
         "arena_planner.cc",
@@ -170,7 +171,6 @@ cc_library_static {
         "mutable_op_resolver.cc",
         "nnapi/nnapi_implementation.cc",
         "nnapi/nnapi_util.cc",
-        "nnapi/sl/SupportLibrary.cc",
         "optional_debug_tools.cc",
         "profiling/atrace_profiler.cc",
         "profiling/platform_profiler.cc",
@@ -237,7 +237,6 @@ cc_library_static {
     apex_available: [
         "//apex_available:platform",
         "com.android.extservices",
-    	"com.android.adservices",
     ],
 }