aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-10-30 18:40:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-30 18:40:22 +0000
commit55187d9009cec41971183fb2c90efea0ed7da4ed (patch)
treefde8aa27b7a189f0161c4bb1049304b2f1ee1791
parentabd9f5717dacc919c96327f3d194f29290e45679 (diff)
parent950d5087bf8346a16d24dbd56648864face3972d (diff)
downloadvixl-55187d9009cec41971183fb2c90efea0ed7da4ed.tar.gz
am 950d5087: am 49d4fae5: Vixl on the host as a shared rather than static library.
* commit '950d5087bf8346a16d24dbd56648864face3972d': Vixl on the host as a shared rather than static library.
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index d35a01e2..d91a64ed 100644
--- a/Android.mk
+++ b/Android.mk
@@ -109,13 +109,13 @@ LOCAL_CPP_EXTENSION := .cc
LOCAL_CPPFLAGS := -O2 -Wall -Wextra -DUSE_SIMULATOR -std=c++11
LOCAL_C_INCLUDES := $(vixl_include_files)
LOCAL_SRC_FILES := $(vixl_src_files)
-LOCAL_STATIC_LIBRARIES := liblog
+LOCAL_SHARED_LIBRARIES := liblog
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libvixl
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MULTILIB := both
include external/libcxx/libcxx.mk
-include $(BUILD_HOST_STATIC_LIBRARY)
+include $(BUILD_HOST_SHARED_LIBRARY)
# cctest_vixl: VIXL native tests (to run all tests execute ./cctest_vixl --run_all)
#