Enable a 64-bit build of the Evergreen AOSP APK (youtube#3926)

b/355499070 Change-Id: Ibd73d24ff89a89668f5400af7ab8af122f463516
kaidokert · Aug 8, 2024 · 4cd9ffc · 4cd9ffc
1 parent 40e7ce8
commit 4cd9ffc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/starboard/android/arm64/platform_configuration/configuration.gni b/starboard/android/arm64/platform_configuration/configuration.gni
@@ -17,3 +17,4 @@ import("//starboard/android/shared/platform_configuration/configuration.gni")
 android_abi = "arm64-v8a"
 arm_version = 8
 sabi_path = "//starboard/sabi/arm64/sabi-v$sb_api_version.json"
+sb_evergreen_compatible_package = true
diff --git a/starboard/loader_app/BUILD.gn b/starboard/loader_app/BUILD.gn
@@ -48,7 +48,8 @@ if (sb_is_evergreen_compatible && sb_evergreen_compatible_package &&
     if (target_cpu == "arm" && arm_float_abi == "softfp") {
       sources = [ "$root_out_dir/../evergreen-$target_cpu-${arm_float_abi}_$build_type/content" ]
     } else if (target_cpu == "arm64") {
-      sources = [ "$root_out_dir/../evergreen-$target_cpu_$build_type/content" ]
+      sources =
+          [ "$root_out_dir/../evergreen-${target_cpu}_$build_type/content" ]
     } else {
       sources = []
     }
@@ -59,8 +60,9 @@ if (sb_is_evergreen_compatible && sb_evergreen_compatible_package &&
     if (target_cpu == "arm" && arm_float_abi == "softfp") {
       sources = [ "$root_out_dir/../evergreen-$target_cpu-${arm_float_abi}_$build_type/manifest.json" ]
     } else if (target_cpu == "arm64") {
-      sources =
-          [ "$root_out_dir/../evergreen-$target_cpu_$build_type/manifest.json" ]
+      sources = [
+        "$root_out_dir/../evergreen-${target_cpu}_$build_type/manifest.json",
+      ]
     } else {
       sources = []
     }