diff --git a/benchmarks/msgq/1.0/Android.mk b/benchmarks/msgq/1.0/Android.mk index 0f4eff1b20..50ff8e55bf 100644 --- a/benchmarks/msgq/1.0/Android.mk +++ b/benchmarks/msgq/1.0/Android.mk @@ -31,4 +31,5 @@ LOCAL_SHARED_LIBRARIES := \ libhwbinder \ libutils \ +LOCAL_MULTILIB := both include $(BUILD_SHARED_LIBRARY) diff --git a/nfc/1.0/Android.mk b/nfc/1.0/Android.mk index 8d02748761..69c2f05797 100644 --- a/nfc/1.0/Android.mk +++ b/nfc/1.0/Android.mk @@ -65,4 +65,5 @@ LOCAL_SHARED_LIBRARIES := \ 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 73359c0883..6d331822d3 100644 --- a/tests/bar/1.0/Android.mk +++ b/tests/bar/1.0/Android.mk @@ -32,6 +32,7 @@ LOCAL_SHARED_LIBRARIES := \ 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 cba9b5a9de..1ea1c5a48e 100644 --- a/tests/expression/1.0/Android.mk +++ b/tests/expression/1.0/Android.mk @@ -31,6 +31,7 @@ LOCAL_SHARED_LIBRARIES := \ 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 7a0de551d7..0758b3d456 100644 --- a/tests/foo/1.0/Android.mk +++ b/tests/foo/1.0/Android.mk @@ -65,6 +65,7 @@ LOCAL_SHARED_LIBRARIES := \ 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 1c5011c69e..ebbe3dadc4 100644 --- a/tests/libhwbinder/1.0/Android.mk +++ b/tests/libhwbinder/1.0/Android.mk @@ -31,6 +31,7 @@ LOCAL_SHARED_LIBRARIES := \ 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 3b9a2808d2..e2f29bd607 100644 --- a/tests/msgq/1.0/Android.mk +++ b/tests/msgq/1.0/Android.mk @@ -31,6 +31,7 @@ LOCAL_SHARED_LIBRARIES := \ libhwbinder \ libutils \ +LOCAL_MULTILIB := both LOCAL_COMPATIBILITY_SUITE := vts -include test/vts/tools/build/Android.packaging_sharedlib.mk include $(BUILD_SHARED_LIBRARY)