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

Commit 80ec81cf authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove LOCAL_CLANG and clang: true"

parents e7ce8c84 cd15fc7b

adb/Android.mk

+0 −5
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ LIBADB_TEST_windows_SRCS := \ 
    sysdeps_win32_test.cpp \



include $(CLEAR_VARS)

LOCAL_CLANG := true

LOCAL_MODULE := libadbd_usb

LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0

LOCAL_SRC_FILES := daemon/usb.cpp
@@ -122,7 +121,6 @@ LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libbase 
include $(BUILD_STATIC_LIBRARY)



include $(CLEAR_VARS)

LOCAL_CLANG := true

LOCAL_MODULE := libadbd

LOCAL_CFLAGS := $(LIBADB_CFLAGS) -DADB_HOST=0

LOCAL_SRC_FILES := \
@@ -171,7 +169,6 @@ LOCAL_MULTILIB := first 
include $(BUILD_HOST_STATIC_LIBRARY)



include $(CLEAR_VARS)

LOCAL_CLANG := true

LOCAL_MODULE := adbd_test

LOCAL_CFLAGS := -DADB_HOST=0 $(LIBADB_CFLAGS)

LOCAL_SRC_FILES := \
@@ -330,8 +327,6 @@ endif 


include $(CLEAR_VARS)



LOCAL_CLANG := true



LOCAL_SRC_FILES := \

    daemon/main.cpp \

    daemon/mdns.cpp \

base/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ cc_library_headers { 
cc_library {

    name: "libbase",

    vendor_available: true,

    clang: true,

    host_supported: true,

    srcs: [

        "file.cpp",
@@ -109,7 +108,6 @@ cc_library { 
cc_test {

    name: "libbase_test",

    host_supported: true,

    clang: true,

    srcs: [

        "endian_test.cpp",

        "errors_test.cpp",

bootstat/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ cc_defaults { 
        "liblog",

        "libmetricslogger",

    ],

    whole_static_libs: ["libgtest_prod"],

    // Clang is required because of C++14

    clang: true,

}



// bootstat static library

fs_mgr/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ common_static_libraries := \ 
    libavb



include $(CLEAR_VARS)

LOCAL_CLANG := true

LOCAL_SANITIZE := integer

LOCAL_SRC_FILES:= fs_mgr_main.cpp

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

init/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -100,5 +100,4 @@ LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \ 
    ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd



LOCAL_SANITIZE := integer

LOCAL_CLANG := true

include $(BUILD_EXECUTABLE)