From ecf75a6a9396475759c5f8b47cdc1929614b9542 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 28 Jul 2016 16:01:42 -0700 Subject: [PATCH] ART: remove gcc cruft from the makefiles ART only builds with clang now, delete all logic to determine gcc vs. clang, and move all LOCAL_CLANG_CFLAGS into LOCAL_CFLAGS. Test: mma, make test-art-host, make test-art-target Change-Id: I578615233ad3e71af18afb47bb11f3be8417216c --- benchmark/Android.mk | 4 +- build/Android.common_build.mk | 153 +++++++++--------------------------- build/Android.executable.mk | 3 +- build/Android.gtest.mk | 14 ++-- compiler/Android.mk | 3 +- disassembler/Android.mk | 3 +- runtime/Android.mk | 5 +- sigchainlib/Android.mk | 16 ++-- test/Android.libarttest.mk | 4 +- test/Android.libnativebridgetest.mk | 4 +- 10 files changed, 64 insertions(+), 145 deletions(-) diff --git a/benchmark/Android.mk b/benchmark/Android.mk index 17ea4da14..2360bcc00 100644 --- a/benchmark/Android.mk +++ b/benchmark/Android.mk @@ -45,7 +45,7 @@ define build-libartbenchmark LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk ifeq ($$(art_target_or_host),target) - $(call set-target-local-clang-vars) + LOCAL_CLANG := $(ART_TARGET_CLANG) $(call set-target-local-cflags-vars,debug) LOCAL_SHARED_LIBRARIES += libdl LOCAL_MULTILIB := both @@ -57,7 +57,7 @@ define build-libartbenchmark LOCAL_CLANG := $(ART_HOST_CLANG) LOCAL_CFLAGS := $(ART_HOST_CFLAGS) $(ART_HOST_DEBUG_CFLAGS) LOCAL_ASFLAGS := $(ART_HOST_ASFLAGS) $(ART_HOST_DEBUG_ASFLAGS) - LOCAL_LDLIBS := $(ART_HOST_LDLIBS) -ldl -lpthread + LOCAL_LDLIBS := -ldl -lpthread LOCAL_IS_HOST_MODULE := true LOCAL_MULTILIB := both include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index e89a38184..bac0ff36f 100644 --- a/build/Android.common_build.mk +++ b/build/Android.common_build.mk @@ -81,134 +81,60 @@ endif ART_DEFAULT_GC_TYPE ?= CMS art_default_gc_type_cflags := -DART_DEFAULT_GC_TYPE_IS_$(ART_DEFAULT_GC_TYPE) -ART_HOST_CFLAGS := -ART_TARGET_CFLAGS := +ART_HOST_CLANG := true +ART_TARGET_CLANG := true -ART_HOST_ASFLAGS := -ART_TARGET_ASFLAGS := - -# Clang build support. +ART_CPP_EXTENSION := .cc -# Host. -ART_HOST_CLANG := false -ifneq ($(WITHOUT_HOST_CLANG),true) - # By default, host builds use clang for better warnings. - ART_HOST_CLANG := true -endif +ART_C_INCLUDES := \ + external/gtest/include \ + external/icu/icu4c/source/common \ + external/lz4/lib \ + external/valgrind/include \ + external/valgrind \ + external/vixl/src \ + external/zlib \ -# Clang on the target. Target builds use GCC by default. -ifneq ($(USE_CLANG_PLATFORM_BUILD),) -ART_TARGET_CLANG := $(USE_CLANG_PLATFORM_BUILD) -else -ART_TARGET_CLANG := false -endif -ART_TARGET_CLANG_arm := -ART_TARGET_CLANG_arm64 := -ART_TARGET_CLANG_mips := -ART_TARGET_CLANG_mips64 := -ART_TARGET_CLANG_x86 := -ART_TARGET_CLANG_x86_64 := - -define set-target-local-clang-vars - LOCAL_CLANG := $(ART_TARGET_CLANG) - $(foreach arch,$(ART_TARGET_SUPPORTED_ARCH), - ifneq ($$(ART_TARGET_CLANG_$(arch)),) - LOCAL_CLANG_$(arch) := $$(ART_TARGET_CLANG_$(arch)) - endif) -endef +# We optimize Thread::Current() with a direct TLS access. This requires access to a private +# Bionic header. +# Note: technically we only need this on device, but this avoids the duplication of the includes. +ART_C_INCLUDES += bionic/libc/private -ART_TARGET_CLANG_CFLAGS := -ART_TARGET_CLANG_CFLAGS_arm := -ART_TARGET_CLANG_CFLAGS_arm64 := -ART_TARGET_CLANG_CFLAGS_mips := -ART_TARGET_CLANG_CFLAGS_mips64 := -ART_TARGET_CLANG_CFLAGS_x86 := -ART_TARGET_CLANG_CFLAGS_x86_64 := +art_cflags := # Warn about thread safety violations with clang. -art_clang_cflags := -Wthread-safety -Wthread-safety-negative +art_cflags += -Wthread-safety -Wthread-safety-negative # Warn if switch fallthroughs aren't annotated. -art_clang_cflags += -Wimplicit-fallthrough +art_cflags += -Wimplicit-fallthrough # Enable float equality warnings. -art_clang_cflags += -Wfloat-equal +art_cflags += -Wfloat-equal # Enable warning of converting ints to void*. -art_clang_cflags += -Wint-to-void-pointer-cast +art_cflags += -Wint-to-void-pointer-cast # Enable warning of wrong unused annotations. -art_clang_cflags += -Wused-but-marked-unused +art_cflags += -Wused-but-marked-unused # Enable warning for deprecated language features. -art_clang_cflags += -Wdeprecated +art_cflags += -Wdeprecated # Enable warning for unreachable break & return. -art_clang_cflags += -Wunreachable-code-break -Wunreachable-code-return +art_cflags += -Wunreachable-code-break -Wunreachable-code-return # Bug: http://b/29823425 Disable -Wconstant-conversion and # -Wundefined-var-template for Clang update to r271374 -art_clang_cflags += -Wno-constant-conversion -Wno-undefined-var-template +art_cflags += -Wno-constant-conversion -Wno-undefined-var-template # Enable missing-noreturn only on non-Mac. As lots of things are not implemented for Apple, it's # a pain. ifneq ($(HOST_OS),darwin) - art_clang_cflags += -Wmissing-noreturn -endif - - -# GCC-only warnings. -art_gcc_cflags := -Wunused-but-set-parameter -# Suggest const: too many false positives, but good for a trial run. -# -Wsuggest-attribute=const -# Useless casts: too many, as we need to be 32/64 agnostic, but the compiler knows. -# -Wuseless-cast -# Zero-as-null: Have to convert all NULL and "diagnostic ignore" all includes like libnativehelper -# that are still stuck pre-C++11. -# -Wzero-as-null-pointer-constant \ -# Suggest final: Have to move to a more recent GCC. -# -Wsuggest-final-types - -ART_TARGET_CLANG_CFLAGS := $(art_clang_cflags) -ifeq ($(ART_HOST_CLANG),true) - # Bug: 15446488. We don't omit the frame pointer to work around - # clang/libunwind bugs that cause SEGVs in run-test-004-ThreadStress. - ART_HOST_CFLAGS += $(art_clang_cflags) -fno-omit-frame-pointer -else - ART_HOST_CFLAGS += $(art_gcc_cflags) + art_cflags += -Wmissing-noreturn endif -ifneq ($(ART_TARGET_CLANG),true) - ART_TARGET_CFLAGS += $(art_gcc_cflags) -else - # TODO: if we ever want to support GCC/Clang mix for multi-target products, this needs to be - # split up. - ifeq ($(ART_TARGET_CLANG_$(TARGET_ARCH)),false) - ART_TARGET_CFLAGS += $(art_gcc_cflags) - endif -endif - -# Clear local variables now their use has ended. -art_clang_cflags := -art_gcc_cflags := - -ART_CPP_EXTENSION := .cc - -ART_C_INCLUDES := \ - external/gtest/include \ - external/icu/icu4c/source/common \ - external/lz4/lib \ - external/valgrind/include \ - external/valgrind \ - external/vixl/src \ - external/zlib \ - -# We optimize Thread::Current() with a direct TLS access. This requires access to a private -# Bionic header. -# Note: technically we only need this on device, but this avoids the duplication of the includes. -ART_C_INCLUDES += bionic/libc/private # Base set of cflags used by all things ART. -art_cflags := \ +art_cflags += \ -fno-rtti \ -std=gnu++11 \ -ggdb3 \ @@ -351,18 +277,27 @@ ifeq ($(HOST_OS),linux) endif endif +ART_HOST_CFLAGS := $(art_cflags) +ART_TARGET_CFLAGS := $(art_cflags) + +ART_HOST_ASFLAGS := $(art_asflags) +ART_TARGET_ASFLAGS := $(art_asflags) + +# Bug: 15446488. We don't omit the frame pointer to work around +# clang/libunwind bugs that cause SEGVs in run-test-004-ThreadStress. +ART_HOST_CFLAGS += -fno-omit-frame-pointer + ifndef LIBART_IMG_HOST_BASE_ADDRESS $(error LIBART_IMG_HOST_BASE_ADDRESS unset) endif -ART_HOST_CFLAGS += $(art_cflags) -DART_BASE_ADDRESS=$(LIBART_IMG_HOST_BASE_ADDRESS) +ART_HOST_CFLAGS += -DART_BASE_ADDRESS=$(LIBART_IMG_HOST_BASE_ADDRESS) ART_HOST_CFLAGS += -DART_DEFAULT_INSTRUCTION_SET_FEATURES=default $(art_host_cflags) -ART_HOST_ASFLAGS += $(art_asflags) ifndef LIBART_IMG_TARGET_BASE_ADDRESS $(error LIBART_IMG_TARGET_BASE_ADDRESS unset) endif -ART_TARGET_CFLAGS += $(art_cflags) -DART_TARGET \ +ART_TARGET_CFLAGS += -DART_TARGET \ -DART_BASE_ADDRESS=$(LIBART_IMG_TARGET_BASE_ADDRESS) \ ifeq ($(ART_TARGET_LINUX),true) @@ -377,7 +312,6 @@ ART_TARGET_CFLAGS += -DART_TARGET_ANDROID endif ART_TARGET_CFLAGS += $(art_target_cflags) -ART_TARGET_ASFLAGS += $(art_asflags) ART_HOST_NON_DEBUG_CFLAGS := $(art_host_non_debug_cflags) ART_TARGET_NON_DEBUG_CFLAGS := $(art_target_non_debug_cflags) @@ -423,18 +357,11 @@ art_host_non_debug_cflags := art_target_non_debug_cflags := art_default_gc_type_cflags := -ART_HOST_LDLIBS := -ifneq ($(ART_HOST_CLANG),true) - # GCC lacks libc++ assumed atomic operations, grab via libatomic. - ART_HOST_LDLIBS += -latomic -endif - ART_TARGET_LDFLAGS := # $(1): ndebug_or_debug define set-target-local-cflags-vars LOCAL_CFLAGS += $(ART_TARGET_CFLAGS) - LOCAL_CFLAGS_x86 += $(ART_TARGET_CFLAGS_x86) LOCAL_ASFLAGS += $(ART_TARGET_ASFLAGS) LOCAL_LDFLAGS += $(ART_TARGET_LDFLAGS) art_target_cflags_ndebug_or_debug := $(1) @@ -446,10 +373,6 @@ define set-target-local-cflags-vars LOCAL_ASFLAGS += $(ART_TARGET_NON_DEBUG_ASFLAGS) endif - LOCAL_CLANG_CFLAGS := $(ART_TARGET_CLANG_CFLAGS) - $(foreach arch,$(ART_TARGET_SUPPORTED_ARCH), - LOCAL_CLANG_CFLAGS_$(arch) += $$(ART_TARGET_CLANG_CFLAGS_$(arch))) - # Clear locally used variables. art_target_cflags_ndebug_or_debug := endef diff --git a/build/Android.executable.mk b/build/Android.executable.mk index 157500b4b..2db16af4c 100644 --- a/build/Android.executable.mk +++ b/build/Android.executable.mk @@ -80,12 +80,11 @@ define build-art-executable endif ifeq ($$(art_target_or_host),target) - $(call set-target-local-clang-vars) + LOCAL_CLANG := $(ART_TARGET_CLANG) $(call set-target-local-cflags-vars,$(6)) LOCAL_SHARED_LIBRARIES += libdl else # host LOCAL_CLANG := $(ART_HOST_CLANG) - LOCAL_LDLIBS := $(ART_HOST_LDLIBS) LOCAL_CFLAGS += $(ART_HOST_CFLAGS) LOCAL_ASFLAGS += $(ART_HOST_ASFLAGS) ifeq ($$(art_ndebug_or_debug),debug) diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 7f8fa8e39..1e2c4effe 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -414,9 +414,9 @@ LOCAL_SHARED_LIBRARIES := libartd libartd-compiler libdl LOCAL_STATIC_LIBRARIES += libgtest LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.gtest.mk -$(eval $(call set-target-local-clang-vars)) +$(eval LOCAL_CLANG := $(ART_TARGET_CLANG)) $(eval $(call set-target-local-cflags-vars,debug)) -LOCAL_CLANG_CFLAGS += -Wno-used-but-marked-unused -Wno-deprecated -Wno-missing-noreturn # gtest issue +LOCAL_CFLAGS += -Wno-used-but-marked-unused -Wno-deprecated -Wno-missing-noreturn # gtest issue include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -432,7 +432,7 @@ LOCAL_STATIC_LIBRARIES := libgtest_host LOCAL_LDLIBS += -ldl -lpthread LOCAL_MULTILIB := both LOCAL_CLANG := $(ART_HOST_CLANG) -LOCAL_CLANG_CFLAGS += -Wno-used-but-marked-unused -Wno-deprecated -Wno-missing-noreturn # gtest issue +LOCAL_CFLAGS += -Wno-used-but-marked-unused -Wno-deprecated -Wno-missing-noreturn # gtest issue LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.gtest.mk include $(BUILD_HOST_SHARED_LIBRARY) @@ -634,13 +634,13 @@ define define-art-gtest LOCAL_CFLAGS := $$(ART_TEST_CFLAGS) ifeq ($$(art_target_or_host),target) - $$(eval $$(call set-target-local-clang-vars)) + $$(eval LOCAL_CLANG := $$(ART_TARGET_CLANG)) $$(eval $$(call set-target-local-cflags-vars,debug)) LOCAL_SHARED_LIBRARIES += libdl libicuuc libicui18n libnativehelper libz libcutils libvixl-arm64 LOCAL_MODULE_PATH_32 := $$(ART_TARGET_NATIVETEST_OUT)/$$(ART_TARGET_ARCH_32) LOCAL_MODULE_PATH_64 := $$(ART_TARGET_NATIVETEST_OUT)/$$(ART_TARGET_ARCH_64) LOCAL_MULTILIB := both - LOCAL_CLANG_CFLAGS += -Wno-used-but-marked-unused -Wno-deprecated -Wno-missing-noreturn # gtest issue + LOCAL_CFLAGS += -Wno-used-but-marked-unused -Wno-deprecated -Wno-missing-noreturn # gtest issue include $$(BUILD_EXECUTABLE) library_path := 2nd_library_path := @@ -681,12 +681,12 @@ valgrind-test-art-target-gtest-$$(art_gtest_name): $$(ART_TEST_TARGET_VALGRIND_G LOCAL_CFLAGS += $$(ART_HOST_CFLAGS) $$(ART_HOST_DEBUG_CFLAGS) LOCAL_ASFLAGS += $$(ART_HOST_ASFLAGS) $$(ART_HOST_DEBUG_ASFLAGS) LOCAL_SHARED_LIBRARIES += libicuuc-host libicui18n-host libnativehelper libziparchive-host libz-host libvixl-arm64 - LOCAL_LDLIBS := $(ART_HOST_LDLIBS) -lpthread -ldl + LOCAL_LDLIBS := -lpthread -ldl LOCAL_IS_HOST_MODULE := true LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := $$(art_gtest_name)32 LOCAL_MODULE_STEM_64 := $$(art_gtest_name)64 - LOCAL_CLANG_CFLAGS += -Wno-used-but-marked-unused -Wno-deprecated -Wno-missing-noreturn # gtest issue + LOCAL_CFLAGS += -Wno-used-but-marked-unused -Wno-deprecated -Wno-missing-noreturn # gtest issue include $$(BUILD_HOST_EXECUTABLE) ART_TEST_HOST_GTEST_$$(art_gtest_name)_RULES := diff --git a/compiler/Android.mk b/compiler/Android.mk index 0b7bd9cee..8261a87cd 100644 --- a/compiler/Android.mk +++ b/compiler/Android.mk @@ -252,13 +252,12 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT LOCAL_CFLAGS := $$(LIBART_COMPILER_CFLAGS) ifeq ($$(art_target_or_host),target) - $(call set-target-local-clang-vars) + LOCAL_CLANG := $(ART_TARGET_CLANG) $(call set-target-local-cflags-vars,$(2)) else # host LOCAL_CLANG := $(ART_HOST_CLANG) LOCAL_CFLAGS += $(ART_HOST_CFLAGS) LOCAL_ASFLAGS += $(ART_HOST_ASFLAGS) - LOCAL_LDLIBS := $(ART_HOST_LDLIBS) ifeq ($$(art_static_or_shared),static) LOCAL_LDFLAGS += -static endif diff --git a/disassembler/Android.mk b/disassembler/Android.mk index 6905f884e..778fe8ee9 100644 --- a/disassembler/Android.mk +++ b/disassembler/Android.mk @@ -59,11 +59,10 @@ define build-libart-disassembler LOCAL_SRC_FILES := $$(LIBART_DISASSEMBLER_SRC_FILES) ifeq ($$(art_target_or_host),target) - $(call set-target-local-clang-vars) + LOCAL_CLANG := $(ART_TARGET_CLANG) $(call set-target-local-cflags-vars,$(2)) else # host LOCAL_CLANG := $(ART_HOST_CLANG) - LOCAL_LDLIBS := $(ART_HOST_LDLIBS) LOCAL_CFLAGS += $(ART_HOST_CFLAGS) LOCAL_ASFLAGS += $(ART_HOST_ASFLAGS) ifeq ($$(art_ndebug_or_debug),debug) diff --git a/runtime/Android.mk b/runtime/Android.mk index 99c4a8262..2bf8bb1d1 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -497,14 +497,13 @@ endif # Clang usage ifeq ($$(art_target_or_host),target) - $$(eval $$(call set-target-local-clang-vars)) + $$(eval LOCAL_CLANG := $$(ART_TARGET_CLANG)) $$(eval $$(call set-target-local-cflags-vars,$(2))) - LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as + LOCAL_ASFLAGS_arm += -no-integrated-as LOCAL_CFLAGS_$(DEX2OAT_TARGET_ARCH) += -DART_DEFAULT_INSTRUCTION_SET_FEATURES="$(LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES)" LOCAL_CFLAGS_$(2ND_DEX2OAT_TARGET_ARCH) += -DART_DEFAULT_INSTRUCTION_SET_FEATURES="$(2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES)" else # host LOCAL_CLANG := $$(ART_HOST_CLANG) - LOCAL_LDLIBS := $$(ART_HOST_LDLIBS) LOCAL_LDLIBS += -ldl -lpthread ifeq ($$(HOST_OS),linux) LOCAL_LDLIBS += -lrt diff --git a/sigchainlib/Android.mk b/sigchainlib/Android.mk index b9e37a136..e1120e444 100644 --- a/sigchainlib/Android.mk +++ b/sigchainlib/Android.mk @@ -24,7 +24,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += $(ART_TARGET_CFLAGS) LOCAL_ASFLAGS += $(ART_TARGET_ASFLAGS) LOCAL_SRC_FILES := sigchain_dummy.cc -LOCAL_CLANG = $(ART_TARGET_CLANG) +LOCAL_CLANG := $(ART_TARGET_CLANG) LOCAL_MODULE:= libsigchain LOCAL_SHARED_LIBRARIES := liblog LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -39,7 +39,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += $(ART_TARGET_CFLAGS) LOCAL_ASFLAGS += $(ART_TARGET_ASFLAGS) LOCAL_SRC_FILES := sigchain.cc -LOCAL_CLANG = $(ART_TARGET_CLANG) +LOCAL_CLANG := $(ART_TARGET_CLANG) LOCAL_MODULE:= libsigchain LOCAL_SHARED_LIBRARIES := liblog LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -54,11 +54,11 @@ LOCAL_MODULE_TAGS := optional LOCAL_IS_HOST_MODULE := true LOCAL_CFLAGS += $(ART_HOST_CFLAGS) LOCAL_ASFLAGS += $(ART_HOST_ASFLAGS) -LOCAL_CLANG = $(ART_HOST_CLANG) +LOCAL_CLANG := $(ART_HOST_CLANG) LOCAL_SRC_FILES := sigchain_dummy.cc LOCAL_MODULE:= libsigchain LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk -LOCAL_LDLIBS = -ldl +LOCAL_LDLIBS := -ldl LOCAL_MULTILIB := both LOCAL_NATIVE_COVERAGE := $(ART_COVERAGE) include $(BUILD_HOST_SHARED_LIBRARY) @@ -69,11 +69,11 @@ LOCAL_MODULE_TAGS := optional LOCAL_IS_HOST_MODULE := true LOCAL_CFLAGS += $(ART_HOST_CFLAGS) LOCAL_ASFLAGS += $(ART_HOST_ASFLAGS) -LOCAL_CLANG = $(ART_HOST_CLANG) +LOCAL_CLANG := $(ART_HOST_CLANG) LOCAL_SRC_FILES := sigchain.cc LOCAL_MODULE:= libsigchain LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk -LOCAL_LDLIBS = -ldl +LOCAL_LDLIBS := -ldl LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) @@ -85,10 +85,10 @@ LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION) LOCAL_MODULE_TAGS := optional LOCAL_IS_HOST_MODULE := true LOCAL_CFLAGS += $(ART_HOST_CFLAGS) -LOCAL_CLANG = $(ART_HOST_CLANG) +LOCAL_CLANG := $(ART_HOST_CLANG) LOCAL_SRC_FILES := sigchain_dummy.cc LOCAL_MODULE:= libsigchain_dummy LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk -LOCAL_LDLIBS = -ldl +LOCAL_LDLIBS := -ldl LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/test/Android.libarttest.mk b/test/Android.libarttest.mk index 7813d1665..ec5b7d23c 100644 --- a/test/Android.libarttest.mk +++ b/test/Android.libarttest.mk @@ -86,7 +86,7 @@ define build-libarttest LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.libarttest.mk ifeq ($$(art_target_or_host),target) - $(call set-target-local-clang-vars) + LOCAL_CLANG := $(ART_TARGET_CLANG) ifeq ($$(suffix),d) $(call set-target-local-cflags-vars,debug) else @@ -109,7 +109,7 @@ define build-libarttest LOCAL_CFLAGS += $(ART_HOST_NON_DEBUG_CFLAGS) LOCAL_ASFLAGS += $(ART_HOST_NON_DEBUG_ASFLAGS) endif - LOCAL_LDLIBS := $(ART_HOST_LDLIBS) -ldl -lpthread + LOCAL_LDLIBS := -ldl -lpthread LOCAL_IS_HOST_MODULE := true LOCAL_MULTILIB := both include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/test/Android.libnativebridgetest.mk b/test/Android.libnativebridgetest.mk index 992332e92..5c97e4dab 100644 --- a/test/Android.libnativebridgetest.mk +++ b/test/Android.libnativebridgetest.mk @@ -48,7 +48,7 @@ define build-libnativebridgetest LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.libnativebridgetest.mk ifeq ($$(art_target_or_host),target) - $(call set-target-local-clang-vars) + LOCAL_CLANG := $(ART_TARGET_CLANG) $(call set-target-local-cflags-vars,debug) LOCAL_SHARED_LIBRARIES += libdl LOCAL_STATIC_LIBRARIES := libgtest @@ -62,7 +62,7 @@ define build-libnativebridgetest LOCAL_CFLAGS := $(ART_HOST_CFLAGS) $(ART_HOST_DEBUG_CFLAGS) LOCAL_ASFLAGS := $(ART_HOST_ASFLAGS) $(ART_HOST_DEBUG_ASFLAGS) LOCAL_SHARED_LIBRARIES := libcutils - LOCAL_LDLIBS := $(ART_HOST_LDLIBS) -ldl -lpthread + LOCAL_LDLIBS := -ldl -lpthread ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -lrt endif -- 2.11.0