diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-20 14:11:00 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-10-20 16:46:29 -0700 |
| commit | e49a4f6db74f4e66486a6aaf6564f997a94e230f (patch) | |
| tree | b99b8699a8d9521caf973d48bef1d3fd7efc6726 /sigchainlib | |
| parent | 1c1786f193323d3bd706463894001117f3471595 (diff) | |
| download | art-e49a4f6db74f4e66486a6aaf6564f997a94e230f.zip art-e49a4f6db74f4e66486a6aaf6564f997a94e230f.tar.gz art-e49a4f6db74f4e66486a6aaf6564f997a94e230f.tar.bz2 | |
Link libsigchain.a instead of sigchain.o
Relative paths may sometimes lead to failed builds
if sources are built in particular order.
Also it is possible to export symbols from static lib
with LOCAL_WHOLE_STATIC_LIBRARIES variable.
Change-Id: I6d62594c2e84020d67254747c1fd465e1144920e
Diffstat (limited to 'sigchainlib')
| -rw-r--r-- | sigchainlib/Android.mk | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/sigchainlib/Android.mk b/sigchainlib/Android.mk index e52adfc..b7ff360 100644 --- a/sigchainlib/Android.mk +++ b/sigchainlib/Android.mk @@ -30,6 +30,18 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.common_build.mk include $(BUILD_SHARED_LIBRARY) +include $(CLEAR_VARS) +LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION) +LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS += $(ART_TARGET_CFLAGS) +LOCAL_SRC_FILES := sigchain.cc +LOCAL_CLANG = $(ART_TARGET_CLANG) +LOCAL_MODULE:= libsigchain +LOCAL_SHARED_LIBRARIES := liblog +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.common_build.mk +include $(BUILD_STATIC_LIBRARY) + # Build host library. include $(CLEAR_VARS) LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION) @@ -43,3 +55,17 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk LOCAL_LDLIBS = -ldl LOCAL_MULTILIB := both include $(BUILD_HOST_SHARED_LIBRARY) + +include $(CLEAR_VARS) +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_SRC_FILES := sigchain.cc +LOCAL_MODULE:= libsigchain +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +LOCAL_LDLIBS = -ldl +LOCAL_MULTILIB := both +include external/libcxx/libcxx.mk +include $(BUILD_HOST_STATIC_LIBRARY) |