diff options
| author | Elliott Hughes <enh@google.com> | 2016-10-10 14:31:12 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2016-10-10 14:31:12 -0700 |
| commit | 36e0d390a2de7d13cdf667d9a7d125f0d66b3107 (patch) | |
| tree | b7ae89c6bbe40c5e820b8ddc2e2f073a67794911 /libnativebridge | |
| parent | 0d762648d0b9cb29f13f3f8cb7815236078fafbd (diff) | |
| download | system_core-36e0d390a2de7d13cdf667d9a7d125f0d66b3107.tar.gz system_core-36e0d390a2de7d13cdf667d9a7d125f0d66b3107.tar.bz2 system_core-36e0d390a2de7d13cdf667d9a7d125f0d66b3107.zip | |
Rely on the platform -std default.
Bug: http://b/32019064
Test: builds
Change-Id: I18a1d816d63b64601485045070851f32d44e85eb
Diffstat (limited to 'libnativebridge')
| -rw-r--r-- | libnativebridge/Android.bp | 1 | ||||
| -rw-r--r-- | libnativebridge/tests/Android.mk | 2 | ||||
| -rw-r--r-- | libnativebridge/tests/Android.nativebridge-dummy.mk | 8 |
3 files changed, 4 insertions, 7 deletions
diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp index 598dfcdc9..5fb56f2d0 100644 --- a/libnativebridge/Android.bp +++ b/libnativebridge/Android.bp @@ -12,7 +12,6 @@ cc_library { "-Wall", ], cppflags: [ - "-std=gnu++11", "-fvisibility=protected", ], diff --git a/libnativebridge/tests/Android.mk b/libnativebridge/tests/Android.mk index 72659396c..5ad1569ed 100644 --- a/libnativebridge/tests/Android.mk +++ b/libnativebridge/tests/Android.mk @@ -31,7 +31,6 @@ shared_libraries := \ $(foreach file,$(test_src_files), \ $(eval include $(CLEAR_VARS)) \ $(eval LOCAL_CLANG := true) \ - $(eval LOCAL_CPPFLAGS := -std=gnu++11) \ $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ $(eval LOCAL_SRC_FILES := $(file)) \ $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ @@ -41,7 +40,6 @@ $(foreach file,$(test_src_files), \ $(foreach file,$(test_src_files), \ $(eval include $(CLEAR_VARS)) \ $(eval LOCAL_CLANG := true) \ - $(eval LOCAL_CPPFLAGS := -std=gnu++11) \ $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ $(eval LOCAL_SRC_FILES := $(file)) \ $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ diff --git a/libnativebridge/tests/Android.nativebridge-dummy.mk b/libnativebridge/tests/Android.nativebridge-dummy.mk index 551765a39..e556f805f 100644 --- a/libnativebridge/tests/Android.nativebridge-dummy.mk +++ b/libnativebridge/tests/Android.nativebridge-dummy.mk @@ -12,7 +12,7 @@ LOCAL_MODULE:= libnativebridge-dummy LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES) LOCAL_CLANG := true LOCAL_CFLAGS += -Werror -Wall -LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected +LOCAL_CPPFLAGS := -fvisibility=protected LOCAL_SHARED_LIBRARIES := libdl LOCAL_MULTILIB := both @@ -27,7 +27,7 @@ LOCAL_MODULE:= libnativebridge-dummy LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES) LOCAL_CLANG := true LOCAL_CFLAGS += -Werror -Wall -LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected +LOCAL_CPPFLAGS := -fvisibility=protected LOCAL_LDFLAGS := -ldl LOCAL_MULTILIB := both @@ -48,7 +48,7 @@ LOCAL_MODULE:= libnativebridge2-dummy LOCAL_SRC_FILES:= $(NATIVE_BRIDGE2_COMMON_SRC_FILES) LOCAL_CLANG := true LOCAL_CFLAGS += -Werror -Wall -LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected +LOCAL_CPPFLAGS := -fvisibility=protected LOCAL_SHARED_LIBRARIES := libdl LOCAL_MULTILIB := both @@ -63,7 +63,7 @@ LOCAL_MODULE:= libnativebridge2-dummy LOCAL_SRC_FILES:= $(NATIVE_BRIDGE2_COMMON_SRC_FILES) LOCAL_CLANG := true LOCAL_CFLAGS += -Werror -Wall -LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected +LOCAL_CPPFLAGS := -fvisibility=protected LOCAL_LDFLAGS := -ldl LOCAL_MULTILIB := both |