diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-03-30 22:27:41 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-30 22:27:41 +0000 |
commit | f431167a454ec9bf3a315317ee837976dcbd5dfb (patch) | |
tree | 33772fcdec0b18b82a478e1abeb890c85f10bbf6 | |
parent | bf44952cd67b4c8c81ea4358b9bde1a7adcfe0eb (diff) | |
parent | 9a004f65098ef0bddb64a748733258654ed3d5bb (diff) | |
download | protobuf-f431167a454ec9bf3a315317ee837976dcbd5dfb.tar.gz |
Merge "Move most protoc sources to libprotoc" am: df8e697966 am: 9a004f6509
Change-Id: I7c41b2cf3572abe673f62027f7a30ea4bf517858
-rw-r--r-- | Android.bp | 112 |
1 files changed, 37 insertions, 75 deletions
diff --git a/Android.bp b/Android.bp index 89d97ee4c..dd7ec6fd6 100644 --- a/Android.bp +++ b/Android.bp @@ -232,80 +232,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", @@ -388,9 +314,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: [ |