diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Android.libarttest.mk | 4 | ||||
| -rw-r--r-- | test/Android.libnativebridgetest.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/Android.libarttest.mk b/test/Android.libarttest.mk index 7813d16657..ec5b7d23c0 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 992332e922..5c97e4dabb 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 |