Snap for 9982369 from 1bcf4cc7241fffd94fd29634874b3f303e9044bf to simpleperf-release

Change-Id: I577d27eb16fba7bd102ad118ff2ce73d089c7547

3 files changed, 30 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 7cbcbc3fd7e..f3ffc15982f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -162,7 +162,7 @@ cc_library_static {
     ],
     whole_static_libs: [
         "libdoubleconversion",
-        "tensorflow_core_proto_all",
+        "tensorflow_core_proto_cpp_lite",
     ],
     shared_libs: [
         "libz",
@@ -249,7 +249,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,
@@ -273,3 +273,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: [
diff --git a/tensorflow/lite/g3doc/android/lite_build.md b/tensorflow/lite/g3doc/android/lite_build.md
index e540c7927d7..309e83e9665 100644
--- a/tensorflow/lite/g3doc/android/lite_build.md
+++ b/tensorflow/lite/g3doc/android/lite_build.md
@@ -45,7 +45,7 @@ by Google from time to time).*
 <!-- mdformat off(devsite fails if there are line-breaks in templates) -->
 {% dynamic if 'tflite-android-tos' in user.acknowledged_walls and request.tld != 'cn' %}
 You can download the Docker file
-<a href="https://raw.githubusercontent.com/tensorflow/tensorflow/master/tensorflow/tools/dockerfiles/tflite-android.Dockerfile">here</a>
+<a href="https://raw.githubusercontent.com/tensorflow/tensorflow/master/tensorflow/lite/tools/tflite-android.Dockerfile">here</a>
 {% dynamic else %} You must acknowledge the terms of service to download the
 file.
 <a class="button button-blue devsite-acknowledgement-link" data-globally-unique-wall-id="tflite-android-tos">Acknowledge</a>