Define ANDROID_ABI in Cobalt (#4622)

b/385380562
youtube · Dec 30, 2024 · 2d18198 · 2d18198
1 parent 7fce4a7
commit 2d18198
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/cobalt/user_agent/BUILD.gn b/cobalt/user_agent/BUILD.gn
@@ -12,6 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+if (is_android) {
+  import("//build/config/android/abi.gni")
+}
+
 static_library("user_agent") {
   sources = [
     "user_agent_platform_info.cc",
@@ -24,4 +28,11 @@ static_library("user_agent") {
     "//starboard/common",
     "//v8:v8_version",
   ]
+
+  if (is_android) {
+    defines = [
+      # Enable compile-time decisions based on the ABI
+      "ANDROID_ABI=$android_app_abi",
+    ]
+  }
 }
diff --git a/starboard/android/arm/platform_configuration/configuration.gni b/starboard/android/arm/platform_configuration/configuration.gni
@@ -14,7 +14,6 @@
 
 import("//starboard/android/shared/platform_configuration/configuration.gni")
 
-android_abi = "armeabi-v7a"
 arm_float_abi = "softfp"
 
 sb_evergreen_compatible_package = true

diff --git a/starboard/android/arm64/platform_configuration/configuration.gni b/starboard/android/arm64/platform_configuration/configuration.gni
@@ -14,6 +14,5 @@
 
 import("//starboard/android/shared/platform_configuration/configuration.gni")
 
-android_abi = "arm64-v8a"
 sabi_path = "//starboard/sabi/arm64/sabi-v$sb_api_version.json"
 sb_evergreen_compatible_package = true
diff --git a/starboard/android/x86/platform_configuration/configuration.gni b/starboard/android/x86/platform_configuration/configuration.gni
@@ -14,7 +14,6 @@
 
 import("//starboard/android/shared/platform_configuration/configuration.gni")
 
-android_abi = "x86"
 sabi_path = "//starboard/sabi/x86/sabi-v$sb_api_version.json"
 
 sb_enable_opus_sse = false