diff options
-rw-r--r-- | alloc-stress/Android.mk | 2 | ||||
-rw-r--r-- | memcpy-perf/Android.mk | 2 | ||||
-rw-r--r-- | mmap-perf/Android.mk | 2 | ||||
-rw-r--r-- | multinetwork/Android.mk | 2 | ||||
-rw-r--r-- | perfprofd/Android.mk | 3 | ||||
-rw-r--r-- | perfprofd/tests/Android.mk | 2 | ||||
-rw-r--r-- | runconuid/Android.mk | 2 | ||||
-rw-r--r-- | su/Android.mk | 4 | ||||
-rw-r--r-- | su/su.cpp (renamed from su/su.c) | 2 | ||||
-rw-r--r-- | tests/kernel.config/Android.mk | 1 | ||||
-rw-r--r-- | tests/lib/testUtil/Android.mk | 1 | ||||
-rw-r--r-- | tests/pagingtest/Android.mk | 2 | ||||
-rw-r--r-- | tests/tcp_nuke_addr/Android.mk | 2 | ||||
-rw-r--r-- | tests/timetest/Android.mk | 1 | ||||
-rw-r--r-- | zram-perf/Android.mk | 4 |
15 files changed, 11 insertions, 21 deletions
diff --git a/alloc-stress/Android.mk b/alloc-stress/Android.mk index 06b5818f..513d1793 100644 --- a/alloc-stress/Android.mk +++ b/alloc-stress/Android.mk @@ -3,7 +3,7 @@ LOCAL_PATH:= $(call my-dir) 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 55ac9279..cbb60288 100644 --- a/memcpy-perf/Android.mk +++ b/memcpy-perf/Android.mk @@ -3,7 +3,7 @@ LOCAL_PATH:= $(call my-dir) 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 bf6e00ea..4ea6a543 100644 --- a/mmap-perf/Android.mk +++ b/mmap-perf/Android.mk @@ -23,7 +23,7 @@ LOCAL_MULTILIB := both 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 16ca6c53..356a46a6 100644 --- a/multinetwork/Android.mk +++ b/multinetwork/Android.mk @@ -8,7 +8,6 @@ include $(CLEAR_VARS) 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 @@ include $(CLEAR_VARS) 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 842937a4..ce52e293 100644 --- a/perfprofd/Android.mk +++ b/perfprofd/Android.mk @@ -5,7 +5,6 @@ perfprofd_cppflags := \ -Wno-sign-compare \ -Wno-unused-parameter \ -Werror \ - -std=gnu++11 \ # # Static library containing guts of AWP daemon. @@ -60,7 +59,7 @@ LOCAL_STATIC_LIBRARIES := libperfprofdcore libperfprofdutils 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 78ea453b..a9c370d8 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 c36baae2..e692bd3f 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 297e0a31..92ad5e31 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 @@ -137,7 +137,7 @@ int main(int argc, char** argv) { 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 756344bc..0f64aed2 100644 --- a/tests/kernel.config/Android.mk +++ b/tests/kernel.config/Android.mk @@ -12,7 +12,6 @@ test_c_flags := \ -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 f814dac3..c5ae26d3 100644 --- a/tests/lib/testUtil/Android.mk +++ b/tests/lib/testUtil/Android.mk @@ -21,7 +21,6 @@ LOCAL_MODULE_TAGS := tests 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 23ffea19..727e3b81 100644 --- a/tests/pagingtest/Android.mk +++ b/tests/pagingtest/Android.mk @@ -8,8 +8,6 @@ LOCAL_SRC_FILES:= \ 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 2eef6089..f45677ea 100644 --- a/tests/tcp_nuke_addr/Android.mk +++ b/tests/tcp_nuke_addr/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) 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 b2a1aa5b..92bbf1ee 100644 --- a/tests/timetest/Android.mk +++ b/tests/timetest/Android.mk @@ -28,7 +28,6 @@ test_c_flags := \ -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 f62e0a24..05456c24 100644 --- a/zram-perf/Android.mk +++ b/zram-perf/Android.mk @@ -3,9 +3,7 @@ LOCAL_PATH:= $(call my-dir) 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) |