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

Commit a16f14f8 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Rely on the platform -std default." am: 53b6fc5d am: 0ef01bab 

am: b48bc88b

Change-Id: I948f14c73030d6d0f0cae8b9e374962ad119f7f6
parents 837584be b48bc88b

libs/binder/tests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ cc_test { 
        "-g",

        "-Wall",

        "-Werror",

        "-std=c++11",

        "-Wno-missing-field-initializers",

        "-Wno-sign-compare",

        "-O3",

libs/input/tests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ cc_library_static { 
    name: "StructLayout_test",

    srcs: ["StructLayout_test.cpp"],

    cflags: [

        "-std=c++11",

        "-O0",

    ],

}

services/surfaceflinger/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ else 
endif



LOCAL_CFLAGS += -fvisibility=hidden -Werror=format

LOCAL_CFLAGS += -std=c++14



LOCAL_STATIC_LIBRARIES := libvkjson

LOCAL_SHARED_LIBRARIES := \
@@ -157,7 +156,6 @@ LOCAL_CLANG := true 
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_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"

LOCAL_CPPFLAGS := -std=c++14



LOCAL_INIT_RC := surfaceflinger.rc
@@ -200,7 +198,6 @@ include $(CLEAR_VARS) 
LOCAL_CLANG := true



LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"

LOCAL_CPPFLAGS := -std=c++14



LOCAL_SRC_FILES := \

    DdmConnection.cpp