aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqiaoli <qiaoli@google.com>2023-03-23 21:30:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-23 21:30:21 +0000
commit791509671a670e4658a1cfc429a8fdc4188c54be (patch)
tree276a8d02970e177ab39b3d83b2982ab018469c00
parentf2382219b0eec90bf30bfcd08bd001d47731ec62 (diff)
parent76672efcc4256d6239501492517a6b5ba08d7d50 (diff)
downloadtensorflow-791509671a670e4658a1cfc429a8fdc4188c54be.tar.gz
Add tensorflow core java proto library am: b5bfcfa3e9 am: 430c9796d8 am: 61b0a5f353 am: 76672efcc4
Original change: https://android-review.googlesource.com/c/platform/external/tensorflow/+/2506815 Change-Id: I119076ebce77db2ea861a3fdcb872c491803984a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp30
-rw-r--r--tensorflow/lite/delegates/Android.bp2
2 files changed, 29 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 11a2450a521..5a92de879c9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -163,7 +163,7 @@ cc_library_static {
],
whole_static_libs: [
"libdoubleconversion",
- "tensorflow_core_proto_all",
+ "tensorflow_core_proto_cpp_lite",
],
shared_libs: [
"libz",
@@ -251,7 +251,7 @@ filegroup(
)
cc_library {
- name: "tensorflow_core_proto_all",
+ name: "tensorflow_core_proto_cpp_lite",
proto: {
export_proto_headers: true,
canonical_path_from_root: false,
@@ -275,3 +275,29 @@ cc_library {
],
export_include_dirs: ["."],
}
+
+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"],
+ apex_available: ["com.android.ondevicepersonalization"],
+}
diff --git a/tensorflow/lite/delegates/Android.bp b/tensorflow/lite/delegates/Android.bp
index aaed4efd634..7e3465f4727 100644
--- a/tensorflow/lite/delegates/Android.bp
+++ b/tensorflow/lite/delegates/Android.bp
@@ -35,7 +35,7 @@ cc_library_static {
],
static_libs: [
"tensorflow_abseil",
- "tensorflow_core_proto_all",
+ "tensorflow_core_proto_cpp_lite",
"libtensorflow_core_mobile_srcs_only_runtime",
],
header_libs: [