Upstream version 10.39.225.0

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

diff --git a/src/build/config/android/config.gni b/src/build/config/android/config.gni
index 819fe4d..7603280 100644 (file)
--- a/src/build/config/android/config.gni
+++ b/src/build/config/android/config.gni
@@ -16,6 +16,15 @@ if (is_android) {
     # system, using the 'android' gyp backend. The WebView code is still built
     # when this is unset, but builds using the normal chromium build system.
     is_android_webview_build = false
+
+    android_default_keystore_path = "//build/android/ant/chromium-debug.keystore"
+    android_default_keystore_name = "chromiumdebugkey"
+    android_default_keystore_password = "chromium"
+
+    # This is a unique identifier for a given build. It's used for
+    # identifying various build artifacts corresponding to a particular build of
+    # chrome (e.g. where to find archived symbols).
+    android_chrome_build_id = "\"\""
   }
 
   if (is_android_webview_build) {
@@ -23,6 +32,7 @@ if (is_android) {
            "You must specify android_src for an Android WebView build.")
   }
 
+
   # Host stuff -----------------------------------------------------------------
 
   # Defines the name the Android build gives to the current host CPU
@@ -62,6 +72,8 @@ if (is_android) {
   # Path to the SDK's android.jar
   android_sdk_jar = "$android_sdk/android.jar"
 
+  zipalign_path = "$android_sdk_build_tools/zipalign"
+
   # Subdirectories inside android_ndk_root that contain the sysroot for the
   # associated platform.
   _android_api_level = 14
@@ -71,7 +83,7 @@ if (is_android) {
 
   # Toolchain root directory for each build. The actual binaries are inside
   # a "bin" directory inside of these.
-  _android_toolchain_version = "4.8"
+  _android_toolchain_version = "4.9"
   x86_android_toolchain_root = "$android_ndk_root/toolchains/x86-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
   arm_android_toolchain_root = "$android_ndk_root/toolchains/arm-linux-androideabi-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
   mips_android_toolchain_root = "$android_ndk_root/toolchains/mipsel-linux-android-${_android_toolchain_version}/prebuilt/${android_host_os}-${android_host_arch}"
@@ -80,18 +92,30 @@ if (is_android) {
   # only need to define the current one, rather than one for every platform
   # like the toolchain roots.
   if (cpu_arch == "x86") {
+    android_prebuilt_arch = "android-x86"
+    _binary_prefix = "i686-linux-android"
+    android_toolchain_root = "$x86_android_toolchain_root"
     android_libgcc_file =
-      "$x86_android_toolchain_root/lib/gcc/i686-linux-android/${_android_toolchain_version}/libgcc.a"
+      "$android_toolchain_root/lib/gcc/i686-linux-android/${_android_toolchain_version}/libgcc.a"
   } else if (cpu_arch == "arm") {
+    android_prebuilt_arch = "android-arm"
+    _binary_prefix = "arm-linux-androideabi"
+    android_toolchain_root = "$arm_android_toolchain_root"
     android_libgcc_file =
-      "$arm_android_toolchain_root/lib/gcc/arm-linux-androideabi/${_android_toolchain_version}/libgcc.a"
+      "$android_toolchain_root/lib/gcc/arm-linux-androideabi/${_android_toolchain_version}/libgcc.a"
   } else if (cpu_arch == "mipsel") {
+    android_prebuilt_arch = "android-mips"
+    _binary_prefix = "mipsel-linux-android"
+    android_toolchain_root = "$mips_android_toolchain_root"
     android_libgcc_file =
-      "$mips_android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain_version}/libgcc.a"
+      "$android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain_version}/libgcc.a"
   } else {
     assert(false, "Need android libgcc support for your target arch.")
   }
 
+  android_readelf = "$android_toolchain_root/bin/$_binary_prefix-readelf"
+  android_gdbserver = "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserver/gdbserver"
+
   # stlport stuff --------------------------------------------------------------
 
   use_system_stlport = is_android_webview_build