summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Wieboldt <lennart.1997@gmx.de>2017-07-25 01:18:06 +0200
committerLennart Wieboldt <lennart.1997@gmx.de>2017-07-25 16:56:15 +0200
commitf4375bef007c8761f972d8d469f5dd7c5fe2dc7c (patch)
treef93d9b95fce4446f6a913ad90e2097ff6e1ae05a
parentfb1b7608f36bed4b940f57f298f9dc89ee24df62 (diff)
downloadextras-f4375bef007c8761f972d8d469f5dd7c5fe2dc7c.tar.gz
Remove LOCAL_CLANG and clang: true
clang is the default compiler since Android nougat Test: mma & verified it´s still build with clang Change-Id: Ie41a98a7d72940e8169996a7081ccec9b94aa61c Signed-off-by: Lennart Wieboldt <lennart.1997@gmx.de>
-rw-r--r--alloc-stress/Android.mk1
-rw-r--r--iotop/Android.mk2
-rw-r--r--libfec/Android.bp2
-rw-r--r--libfec/test/Android.mk2
-rw-r--r--memcpy-perf/Android.mk1
-rw-r--r--mmap-perf/Android.mk1
-rw-r--r--perfprofd/Android.bp3
-rw-r--r--perfprofd/tests/Android.bp2
-rw-r--r--simpleperf/Android.mk16
-rw-r--r--simpleperf/runtest/Android.build.mk2
-rw-r--r--verity/fec/Android.mk1
-rw-r--r--zram-perf/Android.mk1
12 files changed, 0 insertions, 34 deletions
diff --git a/alloc-stress/Android.mk b/alloc-stress/Android.mk
index 513d1793..ec19d798 100644
--- a/alloc-stress/Android.mk
+++ b/alloc-stress/Android.mk
@@ -1,7 +1,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := alloc-stress
LOCAL_CFLAGS += -g -Wall -Werror -Wno-missing-field-initializers -Wno-sign-compare
ifneq ($(ENABLE_MEM_CGROUPS),)
diff --git a/iotop/Android.mk b/iotop/Android.mk
index 414967cd..b8a146df 100644
--- a/iotop/Android.mk
+++ b/iotop/Android.mk
@@ -15,8 +15,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_CLANG := true
-
LOCAL_SRC_FILES := iotop.cpp tasklist.cpp taskstats.cpp
LOCAL_MODULE := iotop
diff --git a/libfec/Android.bp b/libfec/Android.bp
index 44b1c527..0364ab92 100644
--- a/libfec/Android.bp
+++ b/libfec/Android.bp
@@ -34,6 +34,4 @@ cc_library {
},
},
},
-
- clang: true,
}
diff --git a/libfec/test/Android.mk b/libfec/test/Android.mk
index 56a69789..0d5e248f 100644
--- a/libfec/test/Android.mk
+++ b/libfec/test/Android.mk
@@ -3,7 +3,6 @@ LOCAL_PATH:= $(call my-dir)
ifeq ($(HOST_OS),linux)
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_SANITIZE := integer
LOCAL_MODULE := fec_test_read
LOCAL_SRC_FILES := test_read.cpp
@@ -20,7 +19,6 @@ LOCAL_CFLAGS := -Wall -Werror -D_GNU_SOURCE
include $(BUILD_HOST_EXECUTABLE)
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_SANITIZE := integer
LOCAL_MODULE := fec_test_rs
LOCAL_SRC_FILES := test_rs.c
diff --git a/memcpy-perf/Android.mk b/memcpy-perf/Android.mk
index cbb60288..a2b3399a 100644
--- a/memcpy-perf/Android.mk
+++ b/memcpy-perf/Android.mk
@@ -1,7 +1,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := memcpy-perf
LOCAL_CFLAGS += -g -Wall -Werror -Wno-missing-field-initializers -Wno-sign-compare -O3
LOCAL_SRC_FILES := memcpy-perf.cpp test-funcs.cpp
diff --git a/mmap-perf/Android.mk b/mmap-perf/Android.mk
index 8379b08e..96de5ea5 100644
--- a/mmap-perf/Android.mk
+++ b/mmap-perf/Android.mk
@@ -23,7 +23,6 @@ LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_MULTILIB := both
LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)
LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
-LOCAL_CLANG := true
LOCAL_CFLAGS += -g -Wall -Werror -Wno-missing-field-initializers -Wno-sign-compare -O3
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_CXX_STL := libc++_static
diff --git a/perfprofd/Android.bp b/perfprofd/Android.bp
index 58926dc2..f05f3245 100644
--- a/perfprofd/Android.bp
+++ b/perfprofd/Android.bp
@@ -11,7 +11,6 @@ perfprofd_cppflags = [
cc_library_static {
name: "libperfprofdcore",
- clang: true,
local_include_dirs: ["quipper/kernel-headers"],
export_include_dirs: ["."],
@@ -41,7 +40,6 @@ cc_library_static {
//
cc_library_static {
name: "libperfprofdutils",
- clang: true,
cppflags: perfprofd_cppflags,
srcs: ["perfprofdutils.cc"],
@@ -52,7 +50,6 @@ cc_library_static {
//
cc_binary {
name: "perfprofd",
- clang: true,
srcs: ["perfprofdmain.cc"],
static_libs: [
diff --git a/perfprofd/tests/Android.bp b/perfprofd/tests/Android.bp
index 7bd50416..6bed5e34 100644
--- a/perfprofd/tests/Android.bp
+++ b/perfprofd/tests/Android.bp
@@ -12,7 +12,6 @@ perfprofd_test_cppflags = [
//
cc_library_static {
name: "libperfprofdmockutils",
- clang: true,
include_dirs: ["system/extras/perfprofd"],
cppflags: perfprofd_test_cppflags,
@@ -25,7 +24,6 @@ cc_library_static {
cc_test {
name: "perfprofd_test",
test_suites: ["device-tests"],
- clang: true,
stl: "libc++",
static_libs: [
diff --git a/simpleperf/Android.mk b/simpleperf/Android.mk
index d7c56f76..b36c28c0 100644
--- a/simpleperf/Android.mk
+++ b/simpleperf/Android.mk
@@ -128,7 +128,6 @@ libsimpleperf_src_files_windows := \
# libsimpleperf target
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := libsimpleperf
LOCAL_MODULE_TAGS := debug
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
@@ -145,7 +144,6 @@ include $(BUILD_STATIC_LIBRARY)
# libsimpleperf host
include $(CLEAR_VARS)
-#LOCAL_CLANG := true # Comment it to build on windows.
LOCAL_MODULE := libsimpleperf
LOCAL_MODULE_HOST_OS := darwin linux windows
LOCAL_CPPFLAGS := $(simpleperf_cppflags_host)
@@ -171,7 +169,6 @@ include $(BUILD_HOST_STATIC_LIBRARY)
# simpleperf target
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := simpleperf
LOCAL_MODULE_TAGS := debug
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
@@ -227,7 +224,6 @@ endif
# libsimpleperf_record.a on target
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := libsimpleperf_record
LOCAL_CPPFLAGS := $(simpleperf_cppflags_target)
LOCAL_SRC_FILES := record_lib_interface.cpp
@@ -241,7 +237,6 @@ include $(BUILD_STATIC_LIBRARY)
# libsimpleperf_record.so on target
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := libsimpleperf_record
LOCAL_CPPFLAGS := $(simpleperf_cppflags_target)
LOCAL_SRC_FILES := record_lib_interface.cpp
@@ -255,7 +250,6 @@ include $(BUILD_SHARED_LIBRARY)
# libsimpleperf_record.a on host
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := libsimpleperf_record
LOCAL_MODULE_HOST_OS := linux
LOCAL_CPPFLAGS := $(simpleperf_cppflags_host)
@@ -272,7 +266,6 @@ include $(BUILD_HOST_STATIC_LIBRARY)
# libsimpleperf_record.so on host
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := libsimpleperf_record
LOCAL_MODULE_HOST_OS := linux
LOCAL_CPPFLAGS := $(simpleperf_cppflags_host)
@@ -325,7 +318,6 @@ endif
# libsimpleperf_inplace_sampler.so on target
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := libsimpleperf_inplace_sampler
LOCAL_CPPFLAGS := $(simpleperf_cppflags_target)
LOCAL_SRC_FILES := inplace_sampler_lib.cpp
@@ -338,7 +330,6 @@ include $(BUILD_SHARED_LIBRARY)
# libsimpleperf_inplace_sampler.so on host
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := libsimpleperf_inplace_sampler
LOCAL_MODULE_HOST_OS := linux
LOCAL_CPPFLAGS := $(simpleperf_cppflags_host)
@@ -380,7 +371,6 @@ simpleperf_unit_test_src_files_linux := \
# simpleperf_unit_test target
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := simpleperf_unit_test
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_CPPFLAGS := $(simpleperf_cppflags_target)
@@ -420,7 +410,6 @@ simpleperf_cpu_hotplug_test_src_files := \
# simpleperf_cpu_hotplug_test target
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := simpleperf_cpu_hotplug_test
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_CPPFLAGS := $(simpleperf_cppflags_target)
@@ -433,7 +422,6 @@ include $(BUILD_NATIVE_TEST)
# simpleperf_cpu_hotplug_test linux host
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := simpleperf_cpu_hotplug_test
LOCAL_MODULE_HOST_OS := linux
LOCAL_CPPFLAGS := $(simpleperf_cppflags_host)
@@ -457,7 +445,6 @@ libsimpleperf_cts_test_src_files := \
# libsimpleperf_cts_test target
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := libsimpleperf_cts_test
LOCAL_CPPFLAGS := $(simpleperf_cppflags_target) -DRUN_IN_APP_CONTEXT="\"com.android.simpleperf\""
LOCAL_SRC_FILES := $(libsimpleperf_cts_test_src_files)
@@ -469,7 +456,6 @@ include $(BUILD_STATIC_TEST_LIBRARY)
# libsimpleperf_cts_test linux host
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := libsimpleperf_cts_test
LOCAL_MODULE_HOST_OS := linux
LOCAL_CPPFLAGS := $(simpleperf_cppflags_host)
@@ -487,7 +473,6 @@ include $(BUILD_HOST_STATIC_TEST_LIBRARY)
# simpleperf_record_test target
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := simpleperf_record_test
LOCAL_CPPFLAGS := $(simpleperf_cppflags_target)
LOCAL_SRC_FILES := record_lib_test.cpp
@@ -497,7 +482,6 @@ include $(BUILD_NATIVE_TEST)
# simpleperf_record_test linux host
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := simpleperf_record_test
LOCAL_MODULE_HOST_OS := linux
LOCAL_CPPFLAGS := $(simpleperf_cppflags_host)
diff --git a/simpleperf/runtest/Android.build.mk b/simpleperf/runtest/Android.build.mk
index 65f5fdb0..acba92bd 100644
--- a/simpleperf/runtest/Android.build.mk
+++ b/simpleperf/runtest/Android.build.mk
@@ -19,7 +19,6 @@ simpleperf_runtest_cppflags := -Wall -Wextra -Werror -Wunused \
-O0 \
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_CPPFLAGS := $(simpleperf_runtest_cppflags)
LOCAL_SRC_FILES := $(module_src_files)
LOCAL_SHARED_LIBRARIES := libsimpleperf_inplace_sampler
@@ -32,7 +31,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.build.mk
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_CPPFLAGS := $(simpleperf_runtest_cppflags)
LOCAL_SRC_FILES := $(module_src_files)
LOCAL_SHARED_LIBRARIES := libsimpleperf_inplace_sampler
diff --git a/verity/fec/Android.mk b/verity/fec/Android.mk
index 8a35a7ef..8273d0d1 100644
--- a/verity/fec/Android.mk
+++ b/verity/fec/Android.mk
@@ -1,7 +1,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_CLANG := true
ifeq ($(HOST_OS),linux)
LOCAL_SANITIZE := integer
endif
diff --git a/zram-perf/Android.mk b/zram-perf/Android.mk
index 05456c24..581c7590 100644
--- a/zram-perf/Android.mk
+++ b/zram-perf/Android.mk
@@ -1,7 +1,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_CLANG := true
LOCAL_MODULE := zram-perf
LOCAL_CFLAGS += -g -Wall -Werror -Wno-missing-field-initializers -Wno-sign-compare -Wno-unused-parameter
LOCAL_SRC_FILES := \