Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / native_client / build / config / sysroot.gni

diff --git a/src/native_client/build/config/sysroot.gni b/src/native_client/build/config/sysroot.gni
index e821d74..99cde14 100644 (file)
--- a/src/native_client/build/config/sysroot.gni
+++ b/src/native_client/build/config/sysroot.gni
@@ -6,14 +6,14 @@
 # of the sysroot. If no sysroot applies, the variable will be an empty string.
 
 if (is_android) {
-  import("//build/config/android/config.gni")
+  import("//native_client/build/config/android/config.gni")
   if (!is_android_webview_build) {
     if (cpu_arch == "x86") {
-      sysroot = "$android_ndk_root/platforms/android-14/arch-x86"
+      sysroot = rebase_path("$android_ndk_root/$x86_android_sysroot_subdir")
     } else if (cpu_arch == "arm") {
-      sysroot = "$android_ndk_root/platforms/android-14/arch-arm"
+      sysroot = rebase_path("$android_ndk_root/$arm_android_sysroot_subdir")
     } else if (cpu_arch == "mipsel") {
-      sysroot = "$android_ndk_root/platforms/android-14/arch-mips"
+      sysroot = rebase_path("$android_ndk_root/$mips_android_sysroot_subdir")
     } else {
       sysroot = ""
     }
@@ -39,10 +39,11 @@ if (is_android) {
     sysroot = ""
   }
 } else if (is_mac) {
-  import("//build/config/mac/mac_sdk.gni")
+  import("//native_client/build/config/mac/mac_sdk.gni")
+
   sysroot = mac_sdk_path
 } else if (is_ios) {
-  import("//build/config/ios/ios_sdk.gni")
+  import("//native_client/build/config/ios/ios_sdk.gni")
   sysroot = ios_sdk_path
 } else {
   sysroot = ""