Rely on the platform -std default.
Bug: http://b/32019064
Test: builds
Change-Id: I301b223df84ffdea7c93b5c735c859abcc5bb220
diff --git a/alloc-stress/Android.mk b/alloc-stress/Android.mk
index 06b5818..513d179 100644
--- a/alloc-stress/Android.mk
+++ b/alloc-stress/Android.mk
@@ -3,7 +3,7 @@
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_MODULE := alloc-stress
-LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers -Wno-sign-compare
+LOCAL_CFLAGS += -g -Wall -Werror -Wno-missing-field-initializers -Wno-sign-compare
ifneq ($(ENABLE_MEM_CGROUPS),)
LOCAL_CFLAGS += -DENABLE_MEM_CGROUPS
endif
diff --git a/memcpy-perf/Android.mk b/memcpy-perf/Android.mk
index 55ac927..cbb6028 100644
--- a/memcpy-perf/Android.mk
+++ b/memcpy-perf/Android.mk
@@ -3,7 +3,7 @@
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_MODULE := memcpy-perf
-LOCAL_CFLAGS += -g -Wall -Werror -std=c++11 -Wno-missing-field-initializers -Wno-sign-compare -O3
+LOCAL_CFLAGS += -g -Wall -Werror -Wno-missing-field-initializers -Wno-sign-compare -O3
LOCAL_SRC_FILES := memcpy-perf.cpp test-funcs.cpp
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_CXX_STL := libc++_static
diff --git a/mmap-perf/Android.mk b/mmap-perf/Android.mk
index bf6e00e..4ea6a54 100644
--- a/mmap-perf/Android.mk
+++ b/mmap-perf/Android.mk
@@ -23,7 +23,7 @@
LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)
LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
LOCAL_CLANG := true
-LOCAL_CFLAGS += -g -Wall -Werror -std=c++11 -Wno-missing-field-initializers -Wno-sign-compare -O3
+LOCAL_CFLAGS += -g -Wall -Werror -Wno-missing-field-initializers -Wno-sign-compare -O3
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_CXX_STL := libc++_static
LOCAL_STATIC_LIBRARIES := libc
diff --git a/multinetwork/Android.mk b/multinetwork/Android.mk
index 16ca6c5..356a46a 100644
--- a/multinetwork/Android.mk
+++ b/multinetwork/Android.mk
@@ -8,7 +8,6 @@
LOCAL_MODULE := dnschk
LOCAL_C_INCLUDES += frameworks/native/include external/libcxx/include
-LOCAL_CPPFLAGS += -std=c++11
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
ifndef BRILLO
LOCAL_MODULE_TAGS := debug
@@ -21,7 +20,6 @@
LOCAL_MODULE := httpurl
LOCAL_C_INCLUDES += frameworks/native/include external/libcxx/include
-LOCAL_CPPFLAGS += -std=c++11
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
ifndef BRILLO
LOCAL_MODULE_TAGS := debug
diff --git a/perfprofd/Android.mk b/perfprofd/Android.mk
index 842937a..ce52e29 100644
--- a/perfprofd/Android.mk
+++ b/perfprofd/Android.mk
@@ -5,7 +5,6 @@
-Wno-sign-compare \
-Wno-unused-parameter \
-Werror \
- -std=gnu++11 \
#
# Static library containing guts of AWP daemon.
@@ -60,7 +59,7 @@
LOCAL_SHARED_LIBRARIES := liblog libprotobuf-cpp-lite libbase
LOCAL_SYSTEM_SHARED_LIBRARIES := libc libstdc++
LOCAL_CPPFLAGS += $(perfprofd_cppflags)
-LOCAL_CFLAGS := -Wall -Werror -std=gnu++11
+LOCAL_CFLAGS := -Wall -Werror
LOCAL_MODULE := perfprofd
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := debug
diff --git a/perfprofd/tests/Android.mk b/perfprofd/tests/Android.mk
index 78ea453..a9c370d 100644
--- a/perfprofd/tests/Android.mk
+++ b/perfprofd/tests/Android.mk
@@ -1,7 +1,7 @@
# Build the unit tests.
LOCAL_PATH := $(call my-dir)
-perfprofd_test_cppflags := -Wall -Wno-sign-compare -Wno-unused-parameter -Werror -std=gnu++11
+perfprofd_test_cppflags := -Wall -Wno-sign-compare -Wno-unused-parameter -Werror
#
# Static library with mockup utilities layer (called by unit test).
diff --git a/runconuid/Android.mk b/runconuid/Android.mk
index c36baae..e692bd3 100644
--- a/runconuid/Android.mk
+++ b/runconuid/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_CFLAGS := -std=c11 -Wall -Werror
+LOCAL_CFLAGS := -Wall -Werror
LOCAL_SRC_FILES:= runconuid.cpp
diff --git a/su/Android.mk b/su/Android.mk
index 297e0a3..92ad5e3 100644
--- a/su/Android.mk
+++ b/su/Android.mk
@@ -1,9 +1,9 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_CFLAGS := -std=c11 -Wall -Werror
+LOCAL_CFLAGS := -Wall -Werror
-LOCAL_SRC_FILES:= su.c
+LOCAL_SRC_FILES:= su.cpp
LOCAL_MODULE:= su
diff --git a/su/su.c b/su/su.cpp
similarity index 97%
rename from su/su.c
rename to su/su.cpp
index ea61f93..ee1526e 100644
--- a/su/su.c
+++ b/su/su.cpp
@@ -137,7 +137,7 @@
exec_args[i] = *argv++;
}
// Default to the standard shell.
- if (i == 0) exec_args[i++] = "/system/bin/sh";
+ if (i == 0) exec_args[i++] = const_cast<char*>("/system/bin/sh");
exec_args[i] = NULL;
execvp(exec_args[0], exec_args);
diff --git a/tests/kernel.config/Android.mk b/tests/kernel.config/Android.mk
index 756344b..0f64aed 100644
--- a/tests/kernel.config/Android.mk
+++ b/tests/kernel.config/Android.mk
@@ -12,7 +12,6 @@
-Wall -Wextra \
-Werror \
-fno-builtin \
- -std=gnu++11
# Required Tests
cts_src_files := \
diff --git a/tests/lib/testUtil/Android.mk b/tests/lib/testUtil/Android.mk
index f814dac..c5ae26d 100644
--- a/tests/lib/testUtil/Android.mk
+++ b/tests/lib/testUtil/Android.mk
@@ -21,7 +21,6 @@
LOCAL_MODULE:= libtestUtil
LOCAL_SRC_FILES:= testUtil.c
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../include
-LOCAL_CFLAGS += -std=c99
LOCAL_SHARED_LIBRARIES += libcutils libutils
diff --git a/tests/pagingtest/Android.mk b/tests/pagingtest/Android.mk
index 23ffea1..727e3b8 100644
--- a/tests/pagingtest/Android.mk
+++ b/tests/pagingtest/Android.mk
@@ -8,8 +8,6 @@
pageinout_test.c \
thrashing_test.c
-LOCAL_CFLAGS := -std=gnu11
-
LOCAL_MODULE:= pagingtest
LOCAL_MODULE_TAGS := tests
diff --git a/tests/tcp_nuke_addr/Android.mk b/tests/tcp_nuke_addr/Android.mk
index 2eef608..f45677e 100644
--- a/tests/tcp_nuke_addr/Android.mk
+++ b/tests/tcp_nuke_addr/Android.mk
@@ -4,7 +4,7 @@
LOCAL_MODULE := tcp_nuke_addr_test
LOCAL_C_INCLUDES += frameworks/native/include external/libcxx/include
-LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror
+LOCAL_CPPFLAGS += -Wall -Werror
LOCAL_SHARED_LIBRARIES := libc++
LOCAL_SRC_FILES := tcp_nuke_addr_test.cpp
LOCAL_MODULE_TAGS := eng tests
diff --git a/tests/timetest/Android.mk b/tests/timetest/Android.mk
index b2a1aa5..92bbf1e 100644
--- a/tests/timetest/Android.mk
+++ b/tests/timetest/Android.mk
@@ -28,7 +28,6 @@
-Wall -Wextra \
-Werror \
-fno-builtin \
- -std=gnu++11
test_src_files := \
rtc_test.cpp
diff --git a/zram-perf/Android.mk b/zram-perf/Android.mk
index f62e0a2..05456c2 100644
--- a/zram-perf/Android.mk
+++ b/zram-perf/Android.mk
@@ -3,9 +3,7 @@
include $(CLEAR_VARS)
LOCAL_CLANG := true
LOCAL_MODULE := zram-perf
-LOCAL_CFLAGS += -g -Wall -Werror -std=c++11 -Wno-missing-field-initializers -Wno-sign-compare -Wno-unused-parameter
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
+LOCAL_CFLAGS += -g -Wall -Werror -Wno-missing-field-initializers -Wno-sign-compare -Wno-unused-parameter
LOCAL_SRC_FILES := \
zram-perf.cpp
include $(BUILD_EXECUTABLE)
