Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / android_webview / tools / gyp_webview

diff --git a/src/android_webview/tools/gyp_webview b/src/android_webview/tools/gyp_webview
index 9660147..34aa2fc 100755 (executable)
--- a/src/android_webview/tools/gyp_webview
+++ b/src/android_webview/tools/gyp_webview
@@ -15,6 +15,10 @@ echo "Generating makefiles for $PLATFORM"
 
 export PYTHONDONTWRITEBYTECODE=1
 
+# Override the calling user's locale sort order as this affects the generated
+# makefiles.
+export LC_COLLATE=C
+
 CHROME_SRC="$(readlink -f "$(dirname "$0")/../..")"
 GYP="${CHROME_SRC}/build/gyp_chromium"
 
@@ -34,7 +38,6 @@ DEFINES+=" android_webview_build=1"
 android_sdk=$(python -c \
     "import os.path; print os.path.relpath('${ANDROID_SDK_ROOT}', \
     '${ANDROID_BUILD_TOP}')")
-DEFINES+=" android_src=\$(PWD)"
 DEFINES+=" android_ndk_root=ndk_root_unused_in_webview_build"
 DEFINES+=" android_sdk=\$(PWD)/${android_sdk}"
 DEFINES+=" android_sdk_root=\$(PWD)/${android_sdk}"
@@ -43,13 +46,13 @@ DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}"
 
 # TODO: Get rid of this block, crbug.com/334021
 if [[ -n "$CHROME_ANDROID_WEBVIEW_OFFICIAL_BUILD" ]]; then
-  DEFINES+=" logging_like_official_build=1"
   DEFINES+=" tracing_like_official_build=1"
 fi
 
 export GYP_DEFINES="${GYP_DEFINES} ${DEFINES}"
 
 FLAGS="-f android -Gdefault_target=libwebviewchromium -Glimit_to_target_all=1 "\
+"-Gaosp_sdk_version=21 "\
 "--depth=${CHROME_SRC} ${CHROME_SRC}/android_webview/android_webview.gyp"
 
 for host_os in linux mac; do
@@ -77,4 +80,7 @@ for host_os in linux mac; do
   if [ "$PLATFORM" == "${host_platform}-mips" -o "$PLATFORM" == "all" ]; then
     ${GYP} --suffix .${host_platform}-mips ${EFLAGS} -Dtarget_arch=mipsel
   fi
+  if [ "$PLATFORM" == "${host_platform}-mips64" -o "$PLATFORM" == "all" ]; then
+    ${GYP} --suffix .${host_platform}-mips64 ${EFLAGS} -Dtarget_arch=mips64el
+  fi
 done