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

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

Merge "Rely on the platform -std default." 

am: 955648a9

Change-Id: Ic4e9a7fbc7d13cc18ebb84801bf2f2f9a1d04470
parents 195669fe 955648a9

adb/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -18,11 +18,9 @@ ADB_COMMON_CFLAGS := \ 
    -DADB_REVISION='"$(adb_version)"' \



ADB_COMMON_linux_CFLAGS := \

    -std=c++14 \

    -Wexit-time-destructors \



ADB_COMMON_darwin_CFLAGS := \

    -std=c++14 \

    -Wexit-time-destructors \



# Define windows.h and tchar.h Unicode preprocessor symbols so that

debuggerd/Android.mk

+0 −1
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)



common_cppflags := \

    -std=gnu++11 \

    -W \

    -Wall \

    -Wextra \

fastboot/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ LOCAL_SRC_FILES := \ 
LOCAL_MODULE := fastboot

LOCAL_MODULE_TAGS := debug

LOCAL_MODULE_HOST_OS := darwin linux windows

LOCAL_CONLYFLAGS += -std=gnu99

LOCAL_CFLAGS += -Wall -Wextra -Werror -Wunreachable-code



LOCAL_CFLAGS += -DFASTBOOT_REVISION='"$(fastboot_version)"'

libbacktrace/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ cc_defaults { 
        "-Wall",

        "-Werror",

    ],

    conlyflags: ["-std=gnu99"],

    cppflags: ["-std=gnu++11"],



    clang_cflags: ["-Wno-inline-asm"],

libbacktrace/Android.mk

+0 −6
Original line number Diff line number Diff line
@@ -20,12 +20,6 @@ libbacktrace_common_cflags := \ 
	-Wall \

	-Werror \



libbacktrace_common_conlyflags := \

	-std=gnu99 \



libbacktrace_common_cppflags := \

	-std=gnu++11 \



libbacktrace_common_c_includes := \

	external/libunwind/include/tdep \