ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 4ac17e3b: am 4dfe6faa: Merge "Enable host multilib for ART testing."

Browse source 
* commit '4ac17e3b1979f3dcdc2b515fc9d1f349f1b21da6':
  Enable host multilib for ART testing.
This commit is contained in:
Ian Rogers 2014-06-17 18:53:03 +00:00 • committed by Android Git Automerger
commit 4436749284
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libbacktrace/Android.build.mk
View file

@ -18,6 +18,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := $(module) LOCAL_MODULE := $(module)
LOCAL_MODULE_TAGS := $(module_tag) LOCAL_MODULE_TAGS := $(module_tag)
LOCAL_MULTILIB := $($(module)_multilib)
LOCAL_ADDITIONAL_DEPENDENCIES := \ LOCAL_ADDITIONAL_DEPENDENCIES := \
$(LOCAL_PATH)/Android.mk \ $(LOCAL_PATH)/Android.mk \

2
libbacktrace/Android.mk
View file

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

1
libziparchive/Android.mk
View file

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