aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerban Constantinescu <serban.constantinescu@arm.com>2014-11-17 10:00:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-17 10:00:50 +0000
commitac9c714dca7507c442fac09ddbadf9df7e368d56 (patch)
treee447f5347c176c67ccfe0f290c87ab9168577854
parent705e90c104c4b301709dbfc8240e09dbf9e9b91e (diff)
parente9c96f757f00b915dd1cb86447fb88f36cb54607 (diff)
downloadvixl-ac9c714dca7507c442fac09ddbadf9df7e368d56.tar.gz
am e9c96f75: Vixl: Add libvixld host module.
* commit 'e9c96f757f00b915dd1cb86447fb88f36cb54607': Vixl: Add libvixld host module.
-rw-r--r--Android.mk16
1 files changed, 15 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index d91a64ed..22dba2ad 100644
--- a/Android.mk
+++ b/Android.mk
@@ -98,7 +98,7 @@ LOCAL_C_INCLUDES := $(vixl_include_files)
LOCAL_SRC_FILES := $(vixl_src_files)
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libvixlg
+LOCAL_MODULE := libvixld
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include external/libcxx/libcxx.mk
include $(BUILD_SHARED_LIBRARY)
@@ -117,6 +117,20 @@ LOCAL_MULTILIB := both
include external/libcxx/libcxx.mk
include $(BUILD_HOST_SHARED_LIBRARY)
+include $(CLEAR_VARS)
+LOCAL_CLANG := true
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_CPPFLAGS := -O2 -Wall -Wextra -DDEBUG=1 -DUSE_SIMULATOR -std=c++11
+LOCAL_C_INCLUDES := $(vixl_include_files)
+LOCAL_SRC_FILES := $(vixl_src_files)
+LOCAL_SHARED_LIBRARIES := liblog
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := libvixld
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_MULTILIB := both
+include external/libcxx/libcxx.mk
+include $(BUILD_HOST_SHARED_LIBRARY)
+
# cctest_vixl: VIXL native tests (to run all tests execute ./cctest_vixl --run_all)
#
# We only support 64bit host builds of cctest.