summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.bp4
-rw-r--r--icu4c/source/Android.bp1
-rw-r--r--icu4c/source/test/Android.bp2
-rw-r--r--libandroidicu/Android.bp3
-rw-r--r--libandroidicu/static_shim/Android.bp3
5 files changed, 0 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp
index d131143c2..f1c850e7a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -67,10 +67,6 @@ cc_defaults {
"-Wno-unneeded-internal-declaration",
"-Wno-deprecated-declarations",
],
- // Upstream requires C++11 as the minimum version.
- cppflags: [
- "-std=c++11",
- ],
target: {
android: {
cflags: [
diff --git a/icu4c/source/Android.bp b/icu4c/source/Android.bp
index 689f6ba9c..e000efb9b 100644
--- a/icu4c/source/Android.bp
+++ b/icu4c/source/Android.bp
@@ -49,7 +49,6 @@ cc_library {
"-Wall",
"-Werror",
],
- cppflags: ["-std=c++11"],
target: {
windows: {
enabled: true,
diff --git a/icu4c/source/test/Android.bp b/icu4c/source/test/Android.bp
index 0e3462af5..4531fb8d7 100644
--- a/icu4c/source/test/Android.bp
+++ b/icu4c/source/test/Android.bp
@@ -39,8 +39,6 @@ cc_defaults {
"-Wno-unused-parameter",
"-Wno-unused-variable",
],
- c_std: "c11",
- cpp_std: "c++11",
shared_libs: [
"libicu_cts_stub",
"libicuuc_cts_stub",
diff --git a/libandroidicu/Android.bp b/libandroidicu/Android.bp
index 847efaba9..769b30985 100644
--- a/libandroidicu/Android.bp
+++ b/libandroidicu/Android.bp
@@ -71,9 +71,6 @@ cc_library_shared {
"1",
],
},
- cppflags: [
- "-std=c++11", // Use the same C++ version as libicuuc
- ],
cflags: [
"-Wall",
"-Werror",
diff --git a/libandroidicu/static_shim/Android.bp b/libandroidicu/static_shim/Android.bp
index ae2188067..7e4820d16 100644
--- a/libandroidicu/static_shim/Android.bp
+++ b/libandroidicu/static_shim/Android.bp
@@ -32,9 +32,6 @@ cc_library_static {
"libicuuc",
"libicui18n",
],
- cppflags: [
- "-std=c++11", // Use the same standard as libicuuc
- ],
cflags: [
"-Wall",
"-Werror",