Clean up android_srcs and remove unused ANDROID_TF_LITE_HDRS (explicitly disable layering checks for Android targets instead).

Change: 121618669

Author: andrewharp

tensorflow/core/BUILD

@@ -593,6 +593,7 @@ filegroup(
         "//tensorflow/core/kernels:android_srcs",
         "//tensorflow/core/util/ctc:android_srcs",
         "common_runtime/gpu/gpu_tracer.cc",
+        "common_runtime/gpu/gpu_tracer.h",
     ] + glob(
         [
             "client/**/*.cc",
@@ -604,8 +605,6 @@ filegroup(
             "graph/**/*.cc",
             "lib/**/*.h",
             "lib/**/*.cc",
-            "platform/*.h",
-            "platform/*.cc",
             "platform/**/*.h",
             "platform/**/*.cc",
             "public/**/*.h",
@@ -617,52 +616,22 @@ filegroup(
             "**/*testutil*",
             "**/*testlib*",
             "**/*main.cc",
-            "lib/jpeg/*.h",
-            "lib/jpeg/*.cc",
-            "lib/png/*.h",
-            "lib/png/*.cc",
-            "util/events_writer.cc",
-            "util/events_writer.h",
-            # Exclude all protobuf/google headers except protobuf_android.h
+            "lib/jpeg/**/*",
+            "lib/png/**/*",
+            "util/events_writer.*",
+            "platform/default/stream_executor.*",
             "platform/cuda.h",
-            "platform/default/stream_executor.h",
-            "platform/google/cord_coding.h",
-            "platform/google/dynamic_annotations.h",
-            "platform/google/integral_types.h",
-            "platform/google/mutex.h",
-            "platform/google/protobuf.h",
-            "platform/google/stream_executor.h",
-            "platform/google/tracing_impl.h",
-            "platform/google/*.cc",
-            "platform/google/test_benchmark.cc",
-            "platform/google/test_benchmark.h",
-            "platform/jpeg.h",
-            "platform/stream_executor.h",
+            "platform/google/**/*",
+            "platform/jpeg.*",
+            "platform/stream_executor.*",
             "user_ops/**/*.cu.cc",
-            "common_runtime/gpu/*.cc",
-            "common_runtime/gpu/pool_allocator.h",
-            "common_runtime/gpu/gpu_bfc_allocator.h",
-            "common_runtime/gpu/gpu_debug_allocator.h",
-            "common_runtime/gpu/gpu_device.h",
-            "common_runtime/gpu/gpu_util.h",
-            "common_runtime/gpu/gpu_event_mgr.h",
-            "common_runtime/gpu_device_factory.cc",
+            "common_runtime/gpu/**/*",
+            "common_runtime/gpu_device_factory.*",
         ],
     ),
     visibility = ["//visibility:public"],
 )
 
-ANDROID_TF_LITE_HDRS = [
-    "framework/tensor.h",
-    "platform/default/integral_types.h",
-    "platform/env.h",
-    "platform/file_system.h",
-    "platform/logging.h",
-    "platform/platform.h",
-    "platform/types.h",
-    "public/session.h",
-] + proto_text_hdrs_and_srcs.hdrs
-
 # Native library support for Android applications.
 # Does not contain operators, use :android_tensorflow_lib if you want full
 # operator support.
@@ -674,6 +643,9 @@ ANDROID_TF_LITE_HDRS = [
 # --crosstool_top=//external:android/crosstool \
 # --cpu=armeabi-v7a \
 # --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
+#
+# Layering checks are explicitly disabled since hdrs are not used to
+# verify Android builds, which leads to incorrect and misleading header lists.
 cc_library(
     name = "android_tensorflow_lib_lite",
     srcs =
@@ -683,8 +655,8 @@ cc_library(
             ],
             "//conditions:default": [],
         }),
-    hdrs = ANDROID_TF_LITE_HDRS,
     copts = tf_copts() + ["-Os"],
+    features = ["-layering_check"],
     tags = [
         "manual",
         "notap",
@@ -709,6 +681,7 @@ cc_library(
         "//conditions:default": [],
     }),
     copts = tf_copts(),
+    features = ["-layering_check"],
     tags = [
         "manual",
         "notap",

tensorflow/core/kernels/BUILD

@@ -1746,6 +1746,7 @@ cc_library(
         "//conditions:default": [],
     }),
     copts = tf_copts(),
+    features = ["-layering_check"],
     tags = [
         "manual",
         "notap",