diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-23 20:12:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-23 20:12:07 +0000 |
| commit | fe6c0c38b5ecdde83663db0b5ca26ad03acea907 (patch) | |
| tree | 867202e5372ebfa1ff49584d3490a6aed5dc3e05 | |
| parent | a9ccad7dbf5af11cb89c6e61a81e11bcdcb106d3 (diff) | |
| parent | 328c6160511ffbd59f4b6f3f3c67722176a6b625 (diff) | |
| download | libcxxrt-fe6c0c38b5ecdde83663db0b5ca26ad03acea907.tar.gz | |
am 328c6160: Fixes leftovers from when this was a .so
* commit '328c6160511ffbd59f4b6f3f3c67722176a6b625':
Fixes leftovers from when this was a .so
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -48,8 +48,7 @@ LOCAL_SRC_FILES := $(LIBCXXRT_SRC_FILES) LOCAL_CFLAGS := $(LIBCXXRT_CFLAGS) LOCAL_CPPFLAGS := $(LIBCXXRT_CPPFLAGS) -DNO_LIBDL LOCAL_RTTI_FLAG := $(LIBCXXRT_RTTI_FLAG) -LOCAL_LDFLAGS := -nodefaultlibs -LOCAL_SYSTEM_SHARED_LIBRARIES := libc +LOCAL_WHOLE_STATIC_LIBRARIES := libunwind LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_LIBRARY) @@ -62,9 +61,7 @@ LOCAL_SRC_FILES := $(LIBCXXRT_SRC_FILES) LOCAL_CFLAGS := $(LIBCXXRT_CFLAGS) LOCAL_CPPFLAGS := $(LIBCXXRT_CPPFLAGS) LOCAL_RTTI_FLAG := $(LIBCXXRT_RTTI_FLAG) -LOCAL_LDFLAGS := -nodefaultlibs -LOCAL_SHARED_LIBRARIES := libunwind -LOCAL_LDLIBS := -lc +LOCAL_WHOLE_STATIC_LIBRARIES := libunwind LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_STATIC_LIBRARY) endif |