diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-21 15:43:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-21 15:43:34 +0000 |
| commit | 63c2232d80ffad3b6298f401d3004c45bdc2d9a8 (patch) | |
| tree | 337c493a010f433ed6b9b78bfcaf8e7482dbb0a1 | |
| parent | 886a34e14ae21763e264a986f70150bd7e0d3933 (diff) | |
| parent | b0e0d998d2f175a586e48b01d39761e4fceaf662 (diff) | |
| download | protobuf-63c2232d80ffad3b6298f401d3004c45bdc2d9a8.tar.gz | |
Merge changes Ic235469e,I1a1be361,I9121b112 into androidx-master-dev am: b0e0d998d2
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1363498
Change-Id: I09db41db594cb6f40070bffaf8ae61aebebebe78
| -rw-r--r-- | BUILD | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -23,7 +23,7 @@ config_setting( # ZLIB configuration ################################################################################ -ZLIB_DEPS = ["@zlib//:zlib"] +ZLIB_DEPS = ["@zlib_repo//:zlib"] ################################################################################ # Protobuf Runtime Library @@ -49,7 +49,7 @@ MSVC_COPTS = [ ] COPTS = select({ - ":msvc" : MSVC_COPTS, + ":msvc": MSVC_COPTS, "//conditions:default": [ "-DHAVE_PTHREAD", "-DHAVE_ZLIB", @@ -59,6 +59,9 @@ COPTS = select({ # Prevents ISO C++ const string assignment warnings for pyext sources. "-Wno-write-strings", ], +}) + select({ + ":android": ["-std=c++11"], + "//conditions:default": [], }) load(":compiler_config_setting.bzl", "create_compiler_config_setting") @@ -141,7 +144,7 @@ cc_library( ], hdrs = glob(["src/google/protobuf/**/*.h", "src/google/protobuf/**/*.inc"]), copts = COPTS, - includes = ["src/"], + includes = ["src/", "config/"], linkopts = LINK_OPTS, visibility = ["//visibility:public"], ) |