diff options
| author | Brian Carlstrom <bdc@google.com> | 2015-04-02 07:51:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-02 07:51:07 +0000 |
| commit | c6e949a6d93fae2351fc59ed825657adee8185dc (patch) | |
| tree | e8de13b3fb5f240538bbbf139f34f5c8d7896076 | |
| parent | e4285226d1d4d7c4feee16a968540fb2e363339f (diff) | |
| parent | b4524fd56c098c4de4d80e05136d9583eac64c76 (diff) | |
| download | art-c6e949a6d93fae2351fc59ed825657adee8185dc.zip art-c6e949a6d93fae2351fc59ed825657adee8185dc.tar.gz art-c6e949a6d93fae2351fc59ed825657adee8185dc.tar.bz2 | |
Merge "Switch to shared libcutils on host to fix odr-violation"
| -rw-r--r-- | runtime/Android.mk | 2 | ||||
| -rw-r--r-- | test/Android.libnativebridgetest.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/Android.mk b/runtime/Android.mk index dde5407..c0e7f47 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -471,7 +471,7 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT else # host LOCAL_SHARED_LIBRARIES += libziparchive-host # For ashmem_create_region. - LOCAL_STATIC_LIBRARIES += libcutils + LOCAL_SHARED_LIBRARIES += libcutils endif LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk LOCAL_ADDITIONAL_DEPENDENCIES += $$(LOCAL_PATH)/Android.mk diff --git a/test/Android.libnativebridgetest.mk b/test/Android.libnativebridgetest.mk index 452278a..5a5f725 100644 --- a/test/Android.libnativebridgetest.mk +++ b/test/Android.libnativebridgetest.mk @@ -60,7 +60,7 @@ define build-libnativebridgetest else # host LOCAL_CLANG := $(ART_HOST_CLANG) LOCAL_CFLAGS := $(ART_HOST_CFLAGS) $(ART_HOST_DEBUG_CFLAGS) - LOCAL_STATIC_LIBRARIES := libcutils + LOCAL_SHARED_LIBRARIES := libcutils LOCAL_LDLIBS := $(ART_HOST_LDLIBS) -ldl -lpthread ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -lrt |