Add starboard build to android (#4259)

b/368687596
youtube · Oct 18, 2024 · 4386750 · 4386750
1 parent efb2656
commit 4386750
Show file tree

Hide file tree

Showing 23 changed files with 302 additions and 338 deletions.
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
@@ -14,6 +14,8 @@
 # every other file in the build. So variables declared here (that don't start
 # with an underscore) will be implicitly global.
 
+import("//chrobalt/build/configs/chrobalt.gni")
+
 # =============================================================================
 # PLATFORM SELECTION
 # =============================================================================
@@ -280,6 +282,14 @@ if (custom_toolchain != "") {
   set_default_toolchain(_default_toolchain)
 }
 
+if (chrobalt) {
+  if (custom_toolchain != "") {
+    cobalt_toolchain = custom_toolchain
+  } else if (_default_toolchain != "") {
+    cobalt_toolchain = _default_toolchain
+  }
+}
+
 # =============================================================================
 # OS DEFINITIONS
 # =============================================================================
@@ -327,9 +337,8 @@ is_posix = !is_win && !is_fuchsia
 # requirement and just need to add a config everywhere, reference it as a
 # sub-config of an existing one, most commonly the main "compiler" one.
 
-import("//chrobalt/build/configs/chrobalt.gni")
-# TODO(b/371589344): Fix android build configs.
-if (chrobalt && target_os != "android") {
+# TODO: b/374301613 - Consolidate these imports and remove variables where possible.
+if (chrobalt) {
   import("//chrobalt/build/configs/initialize_variables.gni")
   import("//chrobalt/build/configs/variables.gni")
 }

diff --git a/build/config/android/config.gni b/build/config/android/config.gni
@@ -43,7 +43,7 @@ if (is_android || is_chromeos) {
 
     # The default to use for android:minSdkVersion for targets that do
     # not explicitly set it.
-    default_min_sdk_version = 24
+    default_min_sdk_version = 26
 
     # Static analysis can be either "on" or "off" or "build_server". This
     # controls how android lint, error-prone, bytecode checks are run. This
@@ -87,8 +87,8 @@ if (is_android || is_chromeos) {
 
   if (!defined(default_android_ndk_root)) {
     default_android_ndk_root = "//third_party/android_ndk"
-    default_android_ndk_version = "r23"
-    default_android_ndk_major_version = 23
+    default_android_ndk_version = "r26"
+    default_android_ndk_major_version = 26
   } else {
     assert(defined(default_android_ndk_version))
     assert(defined(default_android_ndk_major_version))

diff --git a/build/config/clang/clang.gni b/build/config/clang/clang.gni
@@ -12,11 +12,11 @@ declare_args() {
   # Chrome OS's.
   clang_use_chrome_plugins =
       is_clang && !is_nacl && current_os != "zos" &&
-      default_toolchain != "//build/toolchain/cros:target"
+      default_toolchain != "//build/toolchain/cros:target" && !chrobalt
 
   enable_check_raw_ptr_fields =
       build_with_chromium && !is_official_build &&
-      ((is_linux && !is_castos) || (is_android && !is_cast_android))
+      ((is_linux && !is_castos) || (is_android && !is_cast_android)) && !chrobalt
 
   clang_base_path = default_clang_base_path
 }
diff --git a/chrobalt/BUILD.gn b/chrobalt/BUILD.gn
@@ -14,7 +14,5 @@
 
 group("gn_all") {
   # TODO(b/371589344): Fix android build configs.
-  if (target_os != "android") {
-    deps = [ "//starboard($starboard_toolchain)" ]
-  }
+  deps = [ "//starboard($starboard_toolchain)" ]
 }
diff --git a/chrobalt/build/configs/BUILD.gn b/chrobalt/build/configs/BUILD.gn
@@ -13,8 +13,17 @@
 # limitations under the License.
 
 config("chrobalt_config") {
-  # TODO(b/371589344): Fix android build configs.
-  if (target_os != "android") {
-    configs = [ "//${starboard_path}/platform_configuration" ]
+  configs = [ ":default_includes" ]
+  if (current_toolchain == starboard_toolchain) {
+    configs += [ "//${starboard_path}/platform_configuration" ]
+  }
+}
+
+config("default_includes") {
+  if (is_android) {
+    include_dirs = [
+      # POSIX emulation headers - these need to come *before* system include_dirs.
+      "//starboard/android/shared/posix_emu/include",
+    ]
   }
 }
diff --git a/chrobalt/build/configs/initialize_variables.gni b/chrobalt/build/configs/initialize_variables.gni
@@ -31,7 +31,7 @@ declare_args() {
 
   using_old_compiler = false
 
-  build_with_separate_cobalt_toolchain = true
+  build_with_separate_cobalt_toolchain = target_os != "android"
 }
 
 assert(!(is_starboard && is_native_target_build),
@@ -67,9 +67,7 @@ if (is_mac) {
 # configuration.
 import("//starboard/build/platform_path.gni")
 if (build_with_separate_cobalt_toolchain) {
-  cobalt_toolchain = "//$starboard_path/toolchain:cobalt"
   starboard_toolchain = "//$starboard_path/toolchain:starboard"
 } else {
-  cobalt_toolchain = default_toolchain
   starboard_toolchain = cobalt_toolchain
 }