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

Commit b48bc88b 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

Change-Id: I11137b0f1327691fa88acee67d9270fe509aa353
parents 38bfdb02 0ef01bab

libs/binder/tests/Android.bp

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

        "-g",

        "-Wall",

        "-Wall",

        "-Werror",

        "-Werror",

        "-std=c++11",

        "-Wno-missing-field-initializers",

        "-Wno-missing-field-initializers",

        "-Wno-sign-compare",

        "-Wno-sign-compare",

        "-O3",

        "-O3",

libs/input/tests/Android.bp

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

    name: "StructLayout_test",

    srcs: ["StructLayout_test.cpp"],

    srcs: ["StructLayout_test.cpp"],

    cflags: [

    cflags: [

        "-std=c++11",

        "-O0",

        "-O0",

    ],

    ],

}
 
}

services/surfaceflinger/Android.mk

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

endif





LOCAL_CFLAGS += -fvisibility=hidden -Werror=format

LOCAL_CFLAGS += -fvisibility=hidden -Werror=format

LOCAL_CFLAGS += -std=c++14





LOCAL_STATIC_LIBRARIES := libvkjson

LOCAL_STATIC_LIBRARIES := libvkjson

LOCAL_SHARED_LIBRARIES := \

LOCAL_SHARED_LIBRARIES := \
@@ -140,7 +139,6 @@ LOCAL_CLANG := true 
LOCAL_LDFLAGS_32 := -Wl,--version-script,art/sigchainlib/version-script32.txt -Wl,--export-dynamic

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_LDFLAGS_64 := -Wl,--version-script,art/sigchainlib/version-script64.txt -Wl,--export-dynamic

LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"

LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"

LOCAL_CPPFLAGS := -std=c++14





LOCAL_INIT_RC := surfaceflinger.rc

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

LOCAL_CLANG := true





LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"

LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"

LOCAL_CPPFLAGS := -std=c++14





LOCAL_SRC_FILES := \

LOCAL_SRC_FILES := \

    DdmConnection.cpp

    DdmConnection.cpp