Remove workarounds for running on 32-bit CF
Previously, the 64-bit test suite was being run on a 32-bit test device,
requiring a hacky setup in the build rules to make sure the binaries in
the 64-bit test suite were actually compiled for 32-bit.
Because we now use 64-bit cuttlefish, this hack is no longer required.
Bug: 149618660
Test: presubmit
Change-Id: I1650794843131ecec1c6c4a1215c268bac21f66c
diff --git a/Android.bp b/Android.bp
index 9fd2d23..ab7e8e3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,10 +21,6 @@
name: "com.android.sdkext",
defaults: ["com.android.sdkext-defaults"],
bootclasspath_fragments: ["com.android.sdkext-bootclasspath-fragment"],
- binaries: [
- "derive_classpath",
- "derive_sdk",
- ],
prebuilts: [
"cur_sdkinfo",
"extensions_db",
@@ -37,6 +33,10 @@
name: "com.android.sdkext-defaults",
updatable: true,
min_sdk_version: "30",
+ binaries: [
+ "derive_classpath",
+ "derive_sdk",
+ ],
prebuilts: [
"derive_classpath.rc",
"derive_sdk.rc",
diff --git a/derive_classpath/Android.bp b/derive_classpath/Android.bp
index 9ebabe5..b89eec4 100644
--- a/derive_classpath/Android.bp
+++ b/derive_classpath/Android.bp
@@ -50,17 +50,6 @@
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_classpath_prefer32",
- defaults: ["derive_classpath_binary-defaults"],
- compile_multilib: "prefer32",
- stem: "derive_classpath",
- apex_available: ["test_com.android.sdkext"],
- installable: false,
-}
-
cc_test {
name: "derive_classpath_test",
defaults: ["derive_classpath-defaults"],
diff --git a/derive_sdk/Android.bp b/derive_sdk/Android.bp
index 66ba7bc..55e43bf 100644
--- a/derive_sdk/Android.bp
+++ b/derive_sdk/Android.bp
@@ -51,17 +51,6 @@
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"],
diff --git a/testing/Android.bp b/testing/Android.bp
index fedd3f7..41c428c 100644
--- a/testing/Android.bp
+++ b/testing/Android.bp
@@ -27,18 +27,6 @@
],
file_contexts: ":com.android.sdkext-file_contexts",
installable: false, // Should never be installed on the systemimage
- multilib: {
- prefer32: {
- binaries: [
- "derive_classpath_prefer32",
- "derive_sdk_prefer32",
- ],
- },
- },
- // The automated test infra ends up building this apex for 64+32-bit and
- // then installs it on a 32-bit-only device. Work around this weirdness
- // by preferring 32-bit.
- compile_multilib: "prefer32",
}
genrule {