build 32- and 64-bit libs (auto-generated)
Change-Id: Iccb63cafc5db17abd423d589416d50ff21c89efa
diff --git a/benchmarks/msgq/1.0/Android.mk b/benchmarks/msgq/1.0/Android.mk
index 0f4eff1..50ff8e5 100644
--- a/benchmarks/msgq/1.0/Android.mk
+++ b/benchmarks/msgq/1.0/Android.mk
@@ -31,4 +31,5 @@
libhwbinder \
libutils \
+LOCAL_MULTILIB := both
include $(BUILD_SHARED_LIBRARY)
diff --git a/nfc/1.0/Android.mk b/nfc/1.0/Android.mk
index 8d02748..69c2f05 100644
--- a/nfc/1.0/Android.mk
+++ b/nfc/1.0/Android.mk
@@ -65,4 +65,5 @@
libhwbinder \
libutils \
+LOCAL_MULTILIB := both
include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/bar/1.0/Android.mk b/tests/bar/1.0/Android.mk
index 73359c0..6d33182 100644
--- a/tests/bar/1.0/Android.mk
+++ b/tests/bar/1.0/Android.mk
@@ -32,6 +32,7 @@
libutils \
android.hardware.tests.foo@1.0 \
+LOCAL_MULTILIB := both
LOCAL_COMPATIBILITY_SUITE := vts
-include test/vts/tools/build/Android.packaging_sharedlib.mk
include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/expression/1.0/Android.mk b/tests/expression/1.0/Android.mk
index cba9b5a..1ea1c5a 100644
--- a/tests/expression/1.0/Android.mk
+++ b/tests/expression/1.0/Android.mk
@@ -31,6 +31,7 @@
libhwbinder \
libutils \
+LOCAL_MULTILIB := both
LOCAL_COMPATIBILITY_SUITE := vts
-include test/vts/tools/build/Android.packaging_sharedlib.mk
include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/foo/1.0/Android.mk b/tests/foo/1.0/Android.mk
index 7a0de55..0758b3d 100644
--- a/tests/foo/1.0/Android.mk
+++ b/tests/foo/1.0/Android.mk
@@ -65,6 +65,7 @@
libhwbinder \
libutils \
+LOCAL_MULTILIB := both
LOCAL_COMPATIBILITY_SUITE := vts
-include test/vts/tools/build/Android.packaging_sharedlib.mk
include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/libhwbinder/1.0/Android.mk b/tests/libhwbinder/1.0/Android.mk
index 1c5011c..ebbe3da 100644
--- a/tests/libhwbinder/1.0/Android.mk
+++ b/tests/libhwbinder/1.0/Android.mk
@@ -31,6 +31,7 @@
libhwbinder \
libutils \
+LOCAL_MULTILIB := both
LOCAL_COMPATIBILITY_SUITE := vts
-include test/vts/tools/build/Android.packaging_sharedlib.mk
include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/msgq/1.0/Android.mk b/tests/msgq/1.0/Android.mk
index 3b9a280..e2f29bd 100644
--- a/tests/msgq/1.0/Android.mk
+++ b/tests/msgq/1.0/Android.mk
@@ -31,6 +31,7 @@
libhwbinder \
libutils \
+LOCAL_MULTILIB := both
LOCAL_COMPATIBILITY_SUITE := vts
-include test/vts/tools/build/Android.packaging_sharedlib.mk
include $(BUILD_SHARED_LIBRARY)