Build libart-compiler-llvm successfully, in addition to libartd-compiler-llvm.
Author: Brian Carlstrom. Tested.
Change-Id: Ib1b5dc402ba4b85f56f99dda69112432b7340062
diff --git a/build/Android.libart-compiler-llvm.mk b/build/Android.libart-compiler-llvm.mk
index 31bbb3a..c8c091e 100644
--- a/build/Android.libart-compiler-llvm.mk
+++ b/build/Android.libart-compiler-llvm.mk
@@ -32,8 +32,6 @@
# $(1): target or host
# $(2): ndebug or debug
-# $(3): architecture name
-# $(4): list of source files
define build-libart-compiler-llvm
ifneq ($(1),target)
ifneq ($(1),host)
@@ -48,7 +46,6 @@
art_target_or_host := $(1)
art_ndebug_or_debug := $(2)
- libart_compiler_llvm_src_files := $(3)
include $(CLEAR_VARS)
ifeq ($$(art_target_or_host),target)
@@ -64,7 +61,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
- LOCAL_SRC_FILES := $(libart_compiler_llvm_src_files)
+ LOCAL_SRC_FILES := $(LIBART_COMPILER_LLVM_SRC_FILES)
LOCAL_CFLAGS := $(LIBART_COMPILER_LLVM_CFLAGS)
ifeq ($$(art_target_or_host),target)
LOCAL_CFLAGS += $(ART_TARGET_CFLAGS)
@@ -185,14 +182,14 @@
endef
ifeq ($(ART_BUILD_TARGET_NDEBUG),true)
- $(eval $(call build-libart-compiler-llvm,target,ndebug,$(LIBART_COMPILER_LLVM_SRC_FILES)))
+ $(eval $(call build-libart-compiler-llvm,target,ndebug))
endif
ifeq ($(ART_BUILD_TARGET_DEBUG),true)
- $(eval $(call build-libart-compiler-llvm,target,debug,$(LIBART_COMPILER_LLVM_SRC_FILES)))
+ $(eval $(call build-libart-compiler-llvm,target,debug))
endif
ifeq ($(ART_BUILD_HOST_NDEBUG),true)
- $(eval $(call build-libart-compiler-llvm,host,ndebug,$(LIBART_COMPILER_LLVM_SRC_FILES)))
+ $(eval $(call build-libart-compiler-llvm,host,ndebug))
endif
ifeq ($(ART_BUILD_HOST_DEBUG),true)
- $(eval $(call build-libart-compiler-llvm,host,debug,$(LIBART_COMPILER_LLVM_SRC_FILES)))
+ $(eval $(call build-libart-compiler-llvm,host,debug))
endif
