diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:07:43 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:07:43 +0000 |
commit | a448e7a75a52612fd87aadbcb5bb48c3ed2e149c (patch) | |
tree | d7982b46534c8f770600926a4119593e967eb770 | |
parent | b4a6d5fbc2ab426bfb3abd67dfac297fc09ad36c (diff) | |
parent | 43080d9bef7a0fdb71006469fa032721182ac505 (diff) | |
download | tensorflow-a448e7a75a52612fd87aadbcb5bb48c3ed2e149c.tar.gz |
Snap for 8570526 from 43080d9bef7a0fdb71006469fa032721182ac505 to mainline-mediaprovider-releaseaml_mpr_330911040aml_mpr_330811020
Change-Id: I24a4a4c4ac2eac1c8f17d56a567a26d8056698c8
-rw-r--r-- | Android.bp | 18 | ||||
-rw-r--r-- | tensorflow/lite/Android.bp | 18 | ||||
-rw-r--r-- | tensorflow/lite/delegates/nnapi/TEST_MAPPING | 5 | ||||
-rw-r--r-- | tensorflow/lite/java/Android.bp | 12 | ||||
-rw-r--r-- | tensorflow/lite/tflite_static.bp | 3 |
5 files changed, 53 insertions, 3 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 120cbe9a326..98c198b7bcb 100644 --- a/tensorflow/lite/Android.bp +++ b/tensorflow/lite/Android.bp @@ -54,7 +54,6 @@ cc_library_static { cc_library_static { name: "libtflite_framework", defaults: ["tflite_defaults"], - rtti: true, srcs: [ "allocation.cc", "arena_planner.cc", @@ -153,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/delegates/nnapi/TEST_MAPPING b/tensorflow/lite/delegates/nnapi/TEST_MAPPING index e304f92d66c..ca9065e47bf 100644 --- a/tensorflow/lite/delegates/nnapi/TEST_MAPPING +++ b/tensorflow/lite/delegates/nnapi/TEST_MAPPING @@ -3,5 +3,10 @@ { "name": "CtsTfliteNnapiDelegateTestCases" } + ], + "hwasan-postsubmit": [ + { + "name": "CtsTfliteNnapiDelegateTestCases" + } ] } diff --git a/tensorflow/lite/java/Android.bp b/tensorflow/lite/java/Android.bp index 833c3b05a26..98564b01114 100644 --- a/tensorflow/lite/java/Android.bp +++ b/tensorflow/lite/java/Android.bp @@ -24,21 +24,27 @@ 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/", ], @@ -62,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 178f6778ab3..0bead74ecb7 100644 --- a/tensorflow/lite/tflite_static.bp +++ b/tensorflow/lite/tflite_static.bp @@ -19,7 +19,6 @@ cc_library_static { vendor_available: true, sdk_version: "current", min_sdk_version: "30", - rtti: true, srcs: [ "allocation.cc", "arena_planner.cc", @@ -171,6 +170,7 @@ 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,6 +237,7 @@ cc_library_static { apex_available: [ "//apex_available:platform", "com.android.extservices", + "com.android.adservices", ], } |