Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dfe6faa authored Jun 17, 2014 by Ian Rogers Committed by Gerrit Code Review Jun 17, 2014

Merge "Enable host multilib for ART testing."

parents 2af91ffb 5af80aa1

libbacktrace/Android.build.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ include $(CLEAR_VARS)

		LOCAL_MODULE := $(module)
		LOCAL_MODULE_TAGS := $(module_tag)
		LOCAL_MULTILIB := $($(module)_multilib)

		LOCAL_ADDITIONAL_DEPENDENCIES := \
		$(LOCAL_PATH)/Android.mk \

libbacktrace/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -113,7 +113,9 @@ build_type := target
		build_target := SHARED_LIBRARY
		include $(LOCAL_PATH)/Android.build.mk
		build_type := host
		libbacktrace_libc++_multilib := both
		include $(LOCAL_PATH)/Android.build.mk
		libbacktrace_libc++_multilib :=
		endif

		#-------------------------------------------------------------------------

libziparchive/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ LOCAL_C_INCLUDES += ${includes}
		LOCAL_STATIC_LIBRARIES := libz libutils
		LOCAL_MODULE:= libziparchive-host
		LOCAL_CFLAGS := -Werror
		LOCAL_MULTILIB := both
		include $(BUILD_HOST_STATIC_LIBRARY)

		include $(CLEAR_VARS)