Revert "Remove workarounds for running on 32-bit CF"
This reverts commit edf06db82dd15964be2e9045c8476eca105a8a4f.
Reason for revert: Potentially breaks coverage tests
Bug: 149618660
Change-Id: I0391df36fbc5dabed9fdfde95265e1e406c5a071
diff --git a/derive_sdk/Android.bp b/derive_sdk/Android.bp
index 55e43bf..66ba7bc 100644
--- a/derive_sdk/Android.bp
+++ b/derive_sdk/Android.bp
@@ -51,6 +51,17 @@
apex_available: ["com.android.sdkext"],
}
+// Work around testing using a 64-bit test suite on 32-bit test device by
+// using a prefer32 version of derive_sdk in testing.
+cc_binary {
+ name: "derive_sdk_prefer32",
+ defaults: ["derive_sdk_binary-defaults"],
+ compile_multilib: "prefer32",
+ stem: "derive_sdk",
+ apex_available: ["test_com.android.sdkext"],
+ installable: false,
+}
+
cc_test {
name: "derive_sdk_test",
defaults: ["derive_sdk-defaults"],