commit 4c6396846ce64b7233e2ecb3cf1038dd954617e7
author Anton Hansson <hansson@google.com> Thu May 27 10:01:34 2021 +0000
committer Anton Hansson <hansson@google.com> Thu May 27 15:28:53 2021 +0000
tree c0d50d0cfb863f13adba13e1decfa8746cd0fc03
parent edf06db82dd15964be2e9045c8476eca105a8a4f

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

Android.bp

diff --git a/Android.bp b/Android.bp
index ab7e8e3..9fd2d23 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,6 +21,10 @@
     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",
@@ -33,10 +37,6 @@
     name: "com.android.sdkext-defaults",
     updatable: true,
     min_sdk_version: "30",
-    binaries: [
-        "derive_classpath",
-        "derive_sdk",
-    ],
     prebuilts: [
         "derive_classpath.rc",
         "derive_sdk.rc",