Merge "Stop asking for old versions of C++ in system/core." am: e61e2fcf21 am: 0915192d8b
am: 514464f4ca
Change-Id: Ibbd6515b4a44105e7b965e7b36bc4c3648c7e713
This commit is contained in:
commit
cb6e5d6ed2
3 changed files with 1 additions and 3 deletions
|
|
@ -2,7 +2,6 @@ cc_defaults {
|
||||||
name: "crasher-defaults",
|
name: "crasher-defaults",
|
||||||
|
|
||||||
cppflags: [
|
cppflags: [
|
||||||
"-std=gnu++14",
|
|
||||||
"-W",
|
"-W",
|
||||||
"-Wall",
|
"-Wall",
|
||||||
"-Wextra",
|
"-Wextra",
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ LOCAL_PATH:= $(call my-dir)
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
LOCAL_MODULE := gatekeeperd-unit-tests
|
LOCAL_MODULE := gatekeeperd-unit-tests
|
||||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
||||||
LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers
|
LOCAL_CFLAGS += -g -Wall -Werror -Wno-missing-field-initializers
|
||||||
LOCAL_SHARED_LIBRARIES := libgatekeeper libcrypto libbase
|
LOCAL_SHARED_LIBRARIES := libgatekeeper libcrypto libbase
|
||||||
LOCAL_STATIC_LIBRARIES := libscrypt_static
|
LOCAL_STATIC_LIBRARIES := libscrypt_static
|
||||||
LOCAL_C_INCLUDES := external/scrypt/lib/crypto
|
LOCAL_C_INCLUDES := external/scrypt/lib/crypto
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,6 @@ cc_test {
|
||||||
"-g",
|
"-g",
|
||||||
"-Wall",
|
"-Wall",
|
||||||
"-Werror",
|
"-Werror",
|
||||||
"-std=gnu++11",
|
|
||||||
"-Wno-missing-field-initializers",
|
"-Wno-missing-field-initializers",
|
||||||
],
|
],
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue