Snap for 7080740 from 0f300e3980e49c748dadd77c12d44364961c115d to mainline-networkstack-releaseandroid-mainline-11.0.0_r41android-mainline-11.0.0_r34android-mainline-11.0.0_r17android11-mainline-networkstack-release

Change-Id: I50dab51541c9e3b62c0516e7e5e7dbfcfad10358

1 files changed, 37 insertions, 75 deletions

diff --git a/Android.bp b/Android.bp
index 3d5ac1a00..ed0e49a08 100644
--- a/Android.bp
+++ b/Android.bp
@@ -235,80 +235,6 @@ cc_library {
 
     srcs: [
         "src/google/protobuf/compiler/code_generator.cc",
-        "src/google/protobuf/compiler/plugin.cc",
-        "src/google/protobuf/compiler/plugin.pb.cc",
-    ],
-
-    local_include_dirs: [
-        "config",
-    ],
-    export_include_dirs: [
-        "src",
-        "config",
-    ],
-
-    target: {
-        windows: {
-            enabled: true,
-            // defined by the global cflags, but redefined by protobuf
-            cflags: ["-UWIN32_LEAN_AND_MEAN"],
-        },
-    },
-
-    rtti: true,
-}
-
-cc_library_host_static {
-    name: "libprotoc-kythe",
-    defaults: ["protobuf-cflags-defaults"],
-    srcs: [
-        "src/google/protobuf/compiler/code_generator.cc",
-        "src/google/protobuf/compiler/cpp/cpp_helpers.cc",
-        "src/google/protobuf/compiler/cpp/cpp_enum.cc",
-        "src/google/protobuf/compiler/cpp/cpp_enum_field.cc",
-        "src/google/protobuf/compiler/cpp/cpp_extension.cc",
-        "src/google/protobuf/compiler/cpp/cpp_field.cc",
-        "src/google/protobuf/compiler/cpp/cpp_file.cc",
-        "src/google/protobuf/compiler/cpp/cpp_generator.cc",
-        "src/google/protobuf/compiler/cpp/cpp_map_field.cc",
-        "src/google/protobuf/compiler/cpp/cpp_message.cc",
-        "src/google/protobuf/compiler/cpp/cpp_message_field.cc",
-        "src/google/protobuf/compiler/cpp/cpp_padding_optimizer.cc",
-        "src/google/protobuf/compiler/cpp/cpp_primitive_field.cc",
-        "src/google/protobuf/compiler/cpp/cpp_service.cc",
-        "src/google/protobuf/compiler/cpp/cpp_string_field.cc",
-        "src/google/protobuf/compiler/plugin.cc",
-        "src/google/protobuf/compiler/plugin.pb.cc",
-    ],
-    local_include_dirs: [
-        "src",
-    ],
-    visibility: ["//external/kythe"],
-}
-
-// Android Protocol buffer compiler, aprotoc (host executable)
-// used by the build systems as $(PROTOC) defined in
-// build/core/config.mk
-// =======================================================
-cc_binary_host {
-    name: "aprotoc",
-    defaults: ["protobuf-cflags-defaults"],
-
-    target: {
-        windows: {
-            enabled: true,
-            // defined by the global cflags, but redefined by protobuf
-            cflags: ["-UWIN32_LEAN_AND_MEAN"],
-        },
-    },
-
-    // Statically link libc++ because we copy aprotoc to unbundled projects where
-    // libc++.so may not be available.
-    stl: "libc++_static",
-
-    srcs: [
-        "src/google/protobuf/compiler/main.cc",
-        "src/google/protobuf/compiler/code_generator.cc",
         "src/google/protobuf/compiler/command_line_interface.cc",
         "src/google/protobuf/compiler/cpp/cpp_enum.cc",
         "src/google/protobuf/compiler/cpp/cpp_enum_field.cc",
@@ -391,9 +317,45 @@ cc_binary_host {
         "src/google/protobuf/compiler/zip_writer.cc",
     ],
 
-    local_include_dirs: [
+    export_include_dirs: [
         "android",
         "src",
+        "config",
+    ],
+
+    target: {
+        windows: {
+            enabled: true,
+            // defined by the global cflags, but redefined by protobuf
+            cflags: ["-UWIN32_LEAN_AND_MEAN"],
+        },
+    },
+
+    rtti: true,
+}
+
+// Android Protocol buffer compiler, aprotoc (host executable)
+// used by the build systems as $(PROTOC) defined in
+// build/core/config.mk
+// =======================================================
+cc_binary_host {
+    name: "aprotoc",
+    defaults: ["protobuf-cflags-defaults"],
+
+    target: {
+        windows: {
+            enabled: true,
+            // defined by the global cflags, but redefined by protobuf
+            cflags: ["-UWIN32_LEAN_AND_MEAN"],
+        },
+    },
+
+    // Statically link libc++ because we copy aprotoc to unbundled projects where
+    // libc++.so may not be available.
+    stl: "libc++_static",
+
+    srcs: [
+        "src/google/protobuf/compiler/main.cc",
     ],
 
     static_libs: [