Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66f15cc0 authored Oct 08, 2016 by Treehugger Robot Committed by Gerrit Code Review Oct 08, 2016

Merge "Rely on the platform -std default."

parents 07bc1ee7 c08e32e0

cmds/app_process/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

rs/jni/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

tools/aapt2/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

		# ==========================================================