diff options
| author | Ben Nissan <bennissan@google.com> | 2022-03-22 14:30:09 +0000 |
|---|---|---|
| committer | Ben Nissan <bennissan@google.com> | 2022-05-04 20:09:05 +0000 |
| commit | 43080d9bef7a0fdb71006469fa032721182ac505 (patch) | |
| tree | d7982b46534c8f770600926a4119593e967eb770 | |
| parent | d3554083d8ca9224dfa48d202756fdfe53a651aa (diff) | |
| download | tensorflow-43080d9bef7a0fdb71006469fa032721182ac505.tar.gz | |
Update TFLite build targets with AdServices tflite-support dependencies
Classes in tflite-support to be used in AdServices, including BertNLClassifier, depend on annotations, configurations, and op resolvers from the core tensorflow package. However, these are not included in the current tensorflowlite_java build target, as it only tracks files from the top-level org/tensorflow/lite folder. This CL updates the target to also include subfolders, and thereby the annotations, and creates new targets for the configurations and op resolvers.
Test: m
Bug: 228840235
Change-Id: Iedc9802a8f6086000cb3100354731df0fe0dc815
| -rw-r--r-- | Android.bp | 17 | ||||
| -rw-r--r-- | tensorflow/lite/Android.bp | 17 | ||||
| -rw-r--r-- | tensorflow/lite/java/Android.bp | 2 |
3 files changed, 35 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index 2fd4a8ebd71..b3758f97097 100644 --- a/Android.bp +++ b/Android.bp @@ -122,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 a8209a99ffa..98c198b7bcb 100644 --- a/tensorflow/lite/Android.bp +++ b/tensorflow/lite/Android.bp @@ -152,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/java/Android.bp b/tensorflow/lite/java/Android.bp index 806b1a4365d..98564b01114 100644 --- a/tensorflow/lite/java/Android.bp +++ b/tensorflow/lite/java/Android.bp @@ -31,7 +31,7 @@ java_library_static { ], srcs: [ ":tflite_nnapi_delegate_java", - "src/main/java/org/tensorflow/lite/*.java", + "src/main/java/org/tensorflow/lite/**/*.java", ], static_libs: [ ], |