Merge changes Ic235469e,I1a1be361,I9121b112 into androidx-master-devandroidx-tracing-releaseandroidx-startup-releaseandroidx-mediarouter-releaseandroidx-media2-releaseandroidx-media2-media2-widget-releaseandroidx-media-releaseandroidx-master-releaseandroidx-master-devandroidx-hilt-releaseandroidx-exifinterface-releaseandroidx-datastore-release

* changes:
  Not messing around with individual warnings
  Disable some overly-verbose warnings
  Updates BUILD to work in androidx-studio-integration

1 files changed, 6 insertions, 3 deletions

diff --git a/BUILD b/BUILD
index dbae719ff..07f06747f 100644
--- a/BUILD
+++ b/BUILD
@@ -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"],
 )