revert for mobile

Change-Id: Ie7538fb6c6a62b8c221cad51e4a4986753119a17 Signed-off-by: Kuat Yessenov <[email protected]>
kyessenov · Feb 29, 2024 · 6d21545 · 6d21545
1 parent d07557e
commit 6d21545
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -194,7 +194,7 @@ build:libc++ --define force_libcpp=enabled
 
 build:libc++20 --config=libc++
 # gRPC has a lot of deprecated-enum-enum-conversion warning. Remove once it is addressed
-build:libc++20 --cxxopt=-std=c++20 --copt=-Wno-error=deprecated-enum-enum-conversion
+build:libc++20 --copt=-Wno-error=deprecated-enum-enum-conversion
 
 # Optimize build for binary size reduction.
 build:sizeopt -c opt --copt -Os

diff --git a/mobile/.bazelrc b/mobile/.bazelrc
@@ -193,6 +193,8 @@ build:mobile-remote-ci-linux --config=mobile-remote-ci-common
 build:mobile-remote-ci-linux-clang --action_env=CC=/opt/llvm/bin/clang
 build:mobile-remote-ci-linux-clang --action_env=CXX=/opt/llvm/bin/clang++
 build:mobile-remote-ci-linux-clang --config=mobile-remote-ci-linux
+# Temporary revert to C++17 for mobile NDK builds.
+build:mobile-remote-ci-linux-clang--cxxopt=-std=c++17 --host_cxxopt=-std=c++17
 
 #############################################################################
 # mobile-remote-ci-linux-asan: These options are Linux-only using Clang and AddressSanitizer

diff --git a/mobile/WORKSPACE b/mobile/WORKSPACE
@@ -89,7 +89,7 @@ load("//bazel:android_configure.bzl", "android_configure")
 android_configure(
     name = "local_config_android",
     build_tools_version = "30.0.2",
-    ndk_api_level = 26,
+    ndk_api_level = 21,
     sdk_api_level = 30,
 )