diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-06 15:35:02 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-04-06 15:35:02 -0700 |
| commit | 9b14dc379e783ff00fa203be51f9265bc6428939 (patch) | |
| tree | 2c36459ad0954a815111dfceca1fbca046095f93 /build/Android.gtest.mk | |
| parent | fb9131bd25b5a90e49da5e0f44b23e106558e7e0 (diff) | |
| download | art-9b14dc379e783ff00fa203be51f9265bc6428939.zip art-9b14dc379e783ff00fa203be51f9265bc6428939.tar.gz art-9b14dc379e783ff00fa203be51f9265bc6428939.tar.bz2 | |
ART: Fix gtests for missing-noreturn
gtest.h isn't sufficiently annotated.
Change-Id: I3d5fac8bcdd645227bfd7886c3aa781b225fcc9c
Diffstat (limited to 'build/Android.gtest.mk')
| -rw-r--r-- | build/Android.gtest.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 6714480..0e2dad9 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -257,7 +257,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.gtest.mk $(eval $(call set-target-local-clang-vars)) $(eval $(call set-target-local-cflags-vars,debug)) -LOCAL_CLANG_CFLAGS += -Wno-used-but-marked-unused -Wno-deprecated # gtest issue +LOCAL_CLANG_CFLAGS += -Wno-used-but-marked-unused -Wno-deprecated -Wno-missing-noreturn # gtest issue include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -272,7 +272,7 @@ LOCAL_STATIC_LIBRARIES := libgtest_host LOCAL_LDLIBS += -ldl -lpthread LOCAL_MULTILIB := both LOCAL_CLANG := $(ART_HOST_CLANG) -LOCAL_CLANG_CFLAGS += -Wno-used-but-marked-unused -Wno-deprecated # gtest issue +LOCAL_CLANG_CFLAGS += -Wno-used-but-marked-unused -Wno-deprecated -Wno-missing-noreturn # gtest issue LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.gtest.mk include $(BUILD_HOST_SHARED_LIBRARY) @@ -425,7 +425,7 @@ define define-art-gtest LOCAL_MODULE_PATH_32 := $$(ART_TARGET_NATIVETEST_OUT)/$$(ART_TARGET_ARCH_32) LOCAL_MODULE_PATH_64 := $$(ART_TARGET_NATIVETEST_OUT)/$$(ART_TARGET_ARCH_64) LOCAL_MULTILIB := both - LOCAL_CLANG_CFLAGS += -Wno-used-but-marked-unused -Wno-deprecated # gtest issue + LOCAL_CLANG_CFLAGS += -Wno-used-but-marked-unused -Wno-deprecated -Wno-missing-noreturn # gtest issue include $$(BUILD_EXECUTABLE) library_path := 2nd_library_path := @@ -464,7 +464,7 @@ test-art-target-gtest-$$(art_gtest_name): $$(ART_TEST_TARGET_GTEST_$$(art_gtest_ LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := $$(art_gtest_name)32 LOCAL_MODULE_STEM_64 := $$(art_gtest_name)64 - LOCAL_CLANG_CFLAGS += -Wno-used-but-marked-unused -Wno-deprecated # gtest issue + LOCAL_CLANG_CFLAGS += -Wno-used-but-marked-unused -Wno-deprecated -Wno-missing-noreturn # gtest issue include $$(BUILD_HOST_EXECUTABLE) ART_TEST_HOST_GTEST_$$(art_gtest_name)_RULES := |