diff options
| author | 2016-08-26 18:32:23 +0000 | |
|---|---|---|
| committer | 2016-08-26 18:32:23 +0000 | |
| commit | 3e318825748197e728618fedc56a156e2981e78c (patch) | |
| tree | 33503c4e144417f5e8fca39ce6b1115c9b49395c | |
| parent | cc55a7ce2aa0f10c2da9efaa89855cf075e56e20 (diff) | |
| parent | de7b49ac521d3d4eeff05f09f84a256565a9cdef (diff) | |
Merge "Fix ODR violation"
| -rw-r--r-- | build/Android.gtest.mk | 2 | ||||
| -rw-r--r-- | dex2oat/Android.mk | 6 | ||||
| -rw-r--r-- | imgdiag/Android.mk | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index fecf0baf4f..9ec072f812 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -677,7 +677,7 @@ valgrind-test-art-target-gtest-$$(art_gtest_name): $$(ART_TEST_TARGET_VALGRIND_G LOCAL_CLANG := $$(ART_HOST_CLANG) LOCAL_CFLAGS += $$(ART_HOST_CFLAGS) $$(ART_HOST_DEBUG_CFLAGS) LOCAL_ASFLAGS += $$(ART_HOST_ASFLAGS) $$(ART_HOST_DEBUG_ASFLAGS) - LOCAL_SHARED_LIBRARIES += libicuuc-host libicui18n-host libnativehelper libziparchive-host libz-host libvixld-arm libvixld-arm64 + LOCAL_SHARED_LIBRARIES += libicuuc-host libicui18n-host libnativehelper libziparchive libz-host libvixld-arm libvixld-arm64 LOCAL_LDLIBS := -lpthread -ldl LOCAL_IS_HOST_MODULE := true LOCAL_MULTILIB := both diff --git a/dex2oat/Android.mk b/dex2oat/Android.mk index a9d00d3976..8a179c1e7f 100644 --- a/dex2oat/Android.mk +++ b/dex2oat/Android.mk @@ -57,7 +57,7 @@ endif # Note: the order is important because of static linking resolution. DEX2OAT_STATIC_DEPENDENCIES := \ - libziparchive-host \ + libziparchive \ libnativehelper \ libnativebridge \ libnativeloader \ @@ -74,14 +74,14 @@ DEX2OAT_STATIC_DEPENDENCIES := \ # We always build dex2oat and dependencies, even if the host build is otherwise disabled, since they are used to cross compile for the target. ifeq ($(ART_BUILD_HOST_NDEBUG),true) - $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libart-compiler libsigchain libziparchive-host liblz4,art/compiler,host,ndebug,$(dex2oat_host_arch))) + $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libart-compiler libsigchain libziparchive liblz4,art/compiler,host,ndebug,$(dex2oat_host_arch))) ifeq ($(ART_BUILD_HOST_STATIC),true) $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libart libart-compiler libart libvixl-arm libvixl-arm64 $(DEX2OAT_STATIC_DEPENDENCIES),art/compiler,host,ndebug,$(dex2oat_host_arch),static)) endif endif ifeq ($(ART_BUILD_HOST_DEBUG),true) - $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libartd-compiler libsigchain libziparchive-host liblz4,art/compiler,host,debug,$(dex2oat_host_arch))) + $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libcutils libartd-compiler libsigchain libziparchive liblz4,art/compiler,host,debug,$(dex2oat_host_arch))) ifeq ($(ART_BUILD_HOST_STATIC),true) $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd libartd-compiler libartd libvixld-arm libvixld-arm64 $(DEX2OAT_STATIC_DEPENDENCIES),art/compiler,host,debug,$(dex2oat_host_arch),static)) endif diff --git a/imgdiag/Android.mk b/imgdiag/Android.mk index 83315be8f8..278527fce2 100644 --- a/imgdiag/Android.mk +++ b/imgdiag/Android.mk @@ -29,4 +29,4 @@ IMGDIAG_SRC_FILES := \ # Honor HOST_PREFER_32_BIT, as building a 64-bit imgdiag executable # when HOST_PREFER_32_BIT is true would require an unmet dependency on # 64-bit libbacktrace. -$(eval $(call build-art-multi-executable,imgdiag,$(IMGDIAG_SRC_FILES),libart-compiler libbacktrace,libcutils,libziparchive-host,art/compiler,both,$(HOST_PREFER_32_BIT))) +$(eval $(call build-art-multi-executable,imgdiag,$(IMGDIAG_SRC_FILES),libart-compiler libbacktrace,libcutils,libziparchive,art/compiler,both,$(HOST_PREFER_32_BIT))) |