diff options
| author | Xin Li <delphij@google.com> | 2023-08-14 15:39:06 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2023-08-14 15:39:06 -0700 |
| commit | 782d24f53645c8b61e8bee0038cb7f8e5e53ee66 (patch) | |
| tree | 2771a5a35a3aa8098c910db73be046317b18b27b | |
| parent | a8d83114c9d4b5857e348d331933ace4d3387984 (diff) | |
| parent | 495540c22328c546c281cf603c1d79219e01b44d (diff) | |
| download | tensorflow-tmp_amf_298295554.tar.gz | |
Merge Android U (ab/10368041)tmp_amf_298295554
Bug: 291102124
Merged-In: Idd5c76f203914f36c1a58363a1965fc7abcffb2e
Change-Id: Ief4a7e7ab669f7b3fa6ca0240a4f24bbe8df7595
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | tensorflow/lite/java/Android.bp | 2 | ||||
| -rw-r--r-- | tensorflow/lite/tflite_static.bp | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index f3ffc15982f..95746d2bfb8 100644 --- a/Android.bp +++ b/Android.bp @@ -66,6 +66,7 @@ cc_library_headers { "com.android.extservices", "com.android.neuralnetworks", "test_com.android.neuralnetworks", + "com.android.adservices", ], } @@ -202,9 +203,10 @@ 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", ], } @@ -297,5 +299,7 @@ java_library_static { 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", ], } diff --git a/tensorflow/lite/tflite_static.bp b/tensorflow/lite/tflite_static.bp index 4d404d8d853..959273cc0de 100644 --- a/tensorflow/lite/tflite_static.bp +++ b/tensorflow/lite/tflite_static.bp @@ -249,6 +249,8 @@ cc_library_static { apex_available: [ "//apex_available:platform", "com.android.extservices", + "com.android.adservices", + "com.android.neuralnetworks", ], } |