From cd15fc7ba80b31539e85792ec35d7ebe0c8ff764 Mon Sep 17 00:00:00 2001 From: Lennart Wieboldt Date: Mon, 24 Jul 2017 19:32:07 +0200 Subject: [PATCH] Remove LOCAL_CLANG and clang: true MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit clang is the default compiler since Android nougat Test: mma & verified it´s still build with clang Change-Id: I34adaeef2f6558a09f26027271222bad94780507 Signed-off-by: Lennart Wieboldt --- adb/Android.mk | 5 ----- base/Android.bp | 2 -- bootstat/Android.bp | 3 --- fs_mgr/Android.mk | 1 - init/Android.mk | 1 - libappfuse/Android.bp | 1 - libcutils/Android.bp | 2 -- libion/tests/Android.bp | 1 - libmemunreachable/Android.bp | 1 - libmetricslogger/Android.bp | 1 - libnativebridge/Android.bp | 1 - libnativebridge/tests/Android.mk | 2 -- libnativeloader/Android.bp | 1 - libpackagelistparser/Android.bp | 1 - libsync/Android.bp | 1 - libutils/Android.bp | 2 -- sdcard/Android.mk | 1 - 17 files changed, 27 deletions(-) diff --git a/adb/Android.mk b/adb/Android.mk index ae03593ed..e195bec6a 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -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 \ diff --git a/base/Android.bp b/base/Android.bp index b636dc31c..13957560f 100644 --- a/base/Android.bp +++ b/base/Android.bp @@ -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", diff --git a/bootstat/Android.bp b/bootstat/Android.bp index bc90a6e6a..dd357edd7 100644 --- a/bootstat/Android.bp +++ b/bootstat/Android.bp @@ -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 diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk index f3ca7246f..18ccc436c 100644 --- a/fs_mgr/Android.mk +++ b/fs_mgr/Android.mk @@ -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 diff --git a/init/Android.mk b/init/Android.mk index 670edc049..eada50b03 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -99,5 +99,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) diff --git a/libappfuse/Android.bp b/libappfuse/Android.bp index e659f79fc..bfe5aaf97 100644 --- a/libappfuse/Android.bp +++ b/libappfuse/Android.bp @@ -8,7 +8,6 @@ cc_defaults { "-Wall", "-Werror", ], - clang: true } cc_library_shared { diff --git a/libcutils/Android.bp b/libcutils/Android.bp index 245deb113..85258cdda 100644 --- a/libcutils/Android.bp +++ b/libcutils/Android.bp @@ -156,8 +156,6 @@ cc_library { "-Wall", "-Wextra", ], - - clang: true, } subdirs = ["tests"] diff --git a/libion/tests/Android.bp b/libion/tests/Android.bp index 4428848e1..b3fcb3b61 100644 --- a/libion/tests/Android.bp +++ b/libion/tests/Android.bp @@ -16,7 +16,6 @@ cc_test { name: "ion-unit-tests", - clang: true, cflags: [ "-g", "-Wall", diff --git a/libmemunreachable/Android.bp b/libmemunreachable/Android.bp index 826a576e6..8b76a6513 100644 --- a/libmemunreachable/Android.bp +++ b/libmemunreachable/Android.bp @@ -6,7 +6,6 @@ cc_defaults { "-Wextra", "-Werror", ], - clang: true, shared_libs: [ "libbase", ], diff --git a/libmetricslogger/Android.bp b/libmetricslogger/Android.bp index 26a041abd..c692d1fa3 100644 --- a/libmetricslogger/Android.bp +++ b/libmetricslogger/Android.bp @@ -7,7 +7,6 @@ metricslogger_lib_src_files = [ cc_defaults { name: "metricslogger_defaults", - clang: true, host_supported: true, export_include_dirs: ["include"], diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp index 1cea4cd39..8b48a87e9 100644 --- a/libnativebridge/Android.bp +++ b/libnativebridge/Android.bp @@ -12,7 +12,6 @@ cc_library { host_supported: true, srcs: ["native_bridge.cc"], shared_libs: ["liblog"], - clang: true, export_include_dirs=["include"], diff --git a/libnativebridge/tests/Android.mk b/libnativebridge/tests/Android.mk index 70b3fcc6d..c1e65ff98 100644 --- a/libnativebridge/tests/Android.mk +++ b/libnativebridge/tests/Android.mk @@ -34,7 +34,6 @@ shared_libraries := \ $(foreach file,$(test_src_files), \ $(eval include $(CLEAR_VARS)) \ - $(eval LOCAL_CLANG := true) \ $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ $(eval LOCAL_SRC_FILES := $(file)) \ $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ @@ -43,7 +42,6 @@ $(foreach file,$(test_src_files), \ $(foreach file,$(test_src_files), \ $(eval include $(CLEAR_VARS)) \ - $(eval LOCAL_CLANG := true) \ $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ $(eval LOCAL_SRC_FILES := $(file)) \ $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp index c1133fbc1..13f974424 100644 --- a/libnativeloader/Android.bp +++ b/libnativeloader/Android.bp @@ -19,7 +19,6 @@ cc_library { host_ldlibs: ["-ldl"], }, }, - clang: true, cflags: [ "-Werror", "-Wall", diff --git a/libpackagelistparser/Android.bp b/libpackagelistparser/Android.bp index 70ff52897..a9fec7df3 100644 --- a/libpackagelistparser/Android.bp +++ b/libpackagelistparser/Android.bp @@ -6,7 +6,6 @@ cc_library { local_include_dirs: ["include"], export_include_dirs: ["include"], - clang: true, sanitize: { misc_undefined: ["integer"], }, diff --git a/libsync/Android.bp b/libsync/Android.bp index 4bafb0854..4f71b9fd6 100644 --- a/libsync/Android.bp +++ b/libsync/Android.bp @@ -38,5 +38,4 @@ cc_test { "-Wno-missing-field-initializers", "-Wno-sign-compare", ], - clang: true, } diff --git a/libutils/Android.bp b/libutils/Android.bp index fbfb7c2a8..109ac3326 100644 --- a/libutils/Android.bp +++ b/libutils/Android.bp @@ -142,8 +142,6 @@ cc_library { enabled: true, }, }, - - clang: true, } // Include subdirectory makefiles diff --git a/sdcard/Android.mk b/sdcard/Android.mk index 0c5857462..5b4dc5841 100644 --- a/sdcard/Android.mk +++ b/sdcard/Android.mk @@ -8,6 +8,5 @@ LOCAL_CFLAGS := -Wall -Wno-unused-parameter -Werror LOCAL_SHARED_LIBRARIES := libbase libcutils libminijail libpackagelistparser LOCAL_SANITIZE := integer -LOCAL_CLANG := true include $(BUILD_EXECUTABLE)