diff options
| -rw-r--r-- | cmds/app_process/Android.mk | 1 | ||||
| -rw-r--r-- | rs/jni/Android.mk | 2 | ||||
| -rw-r--r-- | tools/aapt2/Android.mk | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk index e530184b9c6a..b5f1c2aa2b4f 100644 --- a/cmds/app_process/Android.mk +++ b/cmds/app_process/Android.mk @@ -62,7 +62,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libsigchain LOCAL_LDFLAGS := -ldl LOCAL_LDFLAGS_32 := -Wl,--version-script,art/sigchainlib/version-script32.txt -Wl,--export-dynamic LOCAL_LDFLAGS_64 := -Wl,--version-script,art/sigchainlib/version-script64.txt -Wl,--export-dynamic -LOCAL_CPPFLAGS := -std=c++11 LOCAL_MODULE := app_process__asan LOCAL_MULTILIB := both diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk index 0658620534d8..bf3681bd303f 100644 --- a/rs/jni/Android.mk +++ b/rs/jni/Android.mk @@ -28,7 +28,7 @@ LOCAL_C_INCLUDES += \ frameworks/base/libs/hwui \ $(rs_generated_include_dir) -LOCAL_CFLAGS += -Wno-unused-parameter -std=c++11 +LOCAL_CFLAGS += -Wno-unused-parameter LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code LOCAL_ADDITIONAL_DEPENDENCIES := $(addprefix $(rs_generated_include_dir)/,rsgApiFuncDecl.h) diff --git a/tools/aapt2/Android.mk b/tools/aapt2/Android.mk index 2e5fbdc6042c..d86de1eef2a6 100644 --- a/tools/aapt2/Android.mk +++ b/tools/aapt2/Android.mk @@ -141,7 +141,7 @@ hostLdLibs_darwin := -lz cFlags := -Wall -Werror -Wno-unused-parameter -UNDEBUG cFlags_darwin := -D_DARWIN_UNLIMITED_STREAMS cFlags_windows := -Wno-maybe-uninitialized # Incorrectly marking use of Maybe.value() as error. -cppFlags := -std=c++11 -Wno-missing-field-initializers -fno-exceptions -fno-rtti +cppFlags := -Wno-missing-field-initializers -fno-exceptions -fno-rtti protoIncludes := $(call generated-sources-dir-for,STATIC_LIBRARIES,libaapt2,HOST) # ========================================================== |