wip: android support

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>

.cargo/config.toml

@@ -0,0 +1,23 @@
+[target.aarch64-linux-android]
+ar = "./third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar"
+linker = "./third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android29-clang"
+
+[target.arm-linux-androideabi]
+ar = "./third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ar"
+linker = "./third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi29-clang"
+
+[target.armv7-linux-androideabi]
+ar = "./third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ar"
+linker = "./third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi29-clang"
+
+[target.thumbv7neon-linux-androideabi]
+ar = "./third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ar"
+linker = "./third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi29-clang"
+
+[target.i686-linux-android]
+ar = "./third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ar"
+linker = "./third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android29-clang"
+
+[target.x86_64-linux-android]
+ar = "./third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android-ar"
+linker = "./third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android29-clang"

.gitmodules

@@ -3,7 +3,8 @@
 	url = https://chromium.googlesource.com/v8/v8
 [submodule "build"]
 	path = build
-	url = https://github.com/denoland/chromium_build.git
+	url = https://github.com/gponsinet/chromium_build.git
+	branch = android_support
 [submodule "tools/clang"]
 	path = tools/clang
 	url = https://chromium.googlesource.com/chromium/src/tools/clang.git
@@ -19,6 +20,16 @@
 [submodule "buildtools"]
 	path = buildtools
 	url = https://github.com/denoland/chromium_buildtools.git
+	branch = upstream
 [submodule "third_party/zlib"]
 	path = third_party/zlib
 	url = https://chromium.googlesource.com/chromium/src/third_party/zlib.git
+[submodule "third_party/android_ndk"]
+	path = third_party/android_ndk
+	url = https://chromium.googlesource.com/android_ndk.git
+[submodule "third_party/android_platform"]
+	path = third_party/android_platform
+	url = https://chromium.googlesource.com/chromium/src/third_party/android_platform.git
+[submodule "third_party/catapult"]
+	path = third_party/catapult
+	url = https://chromium.googlesource.com/catapult

.gn

@@ -33,4 +33,7 @@ default_args = {
   v8_use_snapshot = true
   is_component_build = false
   symbol_level = 1
+
+  # see build/config/compiler/BUILD.gn:49
+  treat_warnings_as_errors = false
 }

build.rs

@@ -61,7 +61,6 @@ fn build_v8() {
   };
 
   if let Some(clang_base_path) = find_compatible_system_clang() {
-    println!("clang_base_path {}", clang_base_path.display());
     gn_args.push(format!("clang_base_path={:?}", clang_base_path));
     // TODO: Dedupe this with the one from cc_wrapper()
     gn_args.push("treat_warnings_as_errors=false".to_string());
@@ -72,28 +71,50 @@ fn build_v8() {
     gn_args.push(format!("clang_base_path={:?}", clang_base_path));
   }
 
-  if let Some(p) = env::var_os("SCCACHE") {
-    cc_wrapper(&mut gn_args, &Path::new(&p));
-  } else if let Ok(p) = which("sccache") {
-    cc_wrapper(&mut gn_args, &p);
-  } else {
-    println!("cargo:warning=Not using sccache");
-  }
+  // if let Some(p) = env::var_os("SCCACHE") {
+  //   cc_wrapper(&mut gn_args, &Path::new(&p));
+  // } else if let Ok(p) = which("sccache") {
+  //   cc_wrapper(&mut gn_args, &p);
+  // } else {
+  //   println!("cargo:warning=Not using sccache");
+  // }
 
   if let Ok(args) = env::var("GN_ARGS") {
     for arg in args.split_whitespace() {
       gn_args.push(arg.to_string());
     }
   }
 
-  match env::var("CARGO_CFG_TARGET_ARCH").unwrap().as_str() {
-    "aarch64" => {
-      gn_args.push("target_cpu=\"arm64\"".to_string());
-      maybe_install_sysroot("arm64");
-      maybe_install_sysroot("amd64");
+  match env::var("CARGO_CFG_TARGET_OS").unwrap().as_str() {
+    "android" => {
+      Command::new("env").status();
+      let cpu = match env::var("CARGO_CFG_TARGET_ARCH").unwrap().as_str() {
+        "aarch64" => "arm64",
+        "arm" => "arm",
+        "armv7" => "arm",
+        "thumbv7neon" => "arm",
+        "x86" => "x86",
+        "x86_64" => "x64",
+        _ => unimplemented!(),
+      };
+
+      gn_args.push("target_os=\"android\"".to_string());
+      gn_args.push("target_cpu=\"x64\"".to_string());
+      // gn_args.push(format!("target_cpu=\"{}\"", cpu);
+      gn_args.push(format!("v8_target_cpu=\"{}\"", cpu));
+      // gn_args.push("use_sysroot=false".to_string());
+      // gn_args.push("target_sysroot=\"../../../third_party/android_ndk/sysroot\"".to_string());
+      gn_args.push("is_component_build=false".to_string());
+    },
+    _ => match env::var("CARGO_CFG_TARGET_ARCH").unwrap().as_str() {
+      "aarch64" => {
+        gn_args.push("target_cpu=\"arm64\"".to_string());
+        maybe_install_sysroot("arm64");
+        maybe_install_sysroot("amd64");
+      }
+      "x86_64" => gn_args.push("use_sysroot=false".to_string()),
+      _ => unimplemented!(),
     }
-    "x86_64" => gn_args.push("use_sysroot=false".to_string()),
-    _ => unimplemented!(),
   };
 
   let gn_root = env::var("CARGO_MANIFEST_DIR").unwrap();
@@ -265,16 +286,25 @@ fn is_compatible_clang_version(clang_path: &Path) -> bool {
 }
 
 fn find_compatible_system_clang() -> Option<PathBuf> {
-  if let Ok(p) = env::var("CLANG_BASE_PATH") {
-    let base_path = Path::new(&p);
-    let clang_path = base_path.join("bin").join("clang");
-    if is_compatible_clang_version(&clang_path) {
-      return Some(base_path.to_path_buf());
+  match env::var("CARGO_CFG_TARGET_OS").unwrap().as_str() {
+    // "android" => {
+    //   let rustc_linker = env::var("RUSTC_LINKER".to_string()).unwrap();
+    //   let linker_path = Path::new(&rustc_linker);
+    //   return Some(linker_path.parent().unwrap().parent().unwrap().to_path_buf());
+    // },
+    _ => {
+      if let Ok(p) = env::var("CLANG_BASE_PATH") {
+        let base_path = Path::new(&p);
+        let clang_path = base_path.join("bin").join("clang");
+        if is_compatible_clang_version(&clang_path) {
+          return Some(base_path.to_path_buf());
+        }
+      }
+      println!("using Chromiums clang");
+      None
     }
   }
 
-  println!("using Chromiums clang");
-  None
 }
 
 // Download chromium's clang into OUT_DIR because Cargo will not allow us to