| Index: android_webview/tools/gyp_webview | 
| diff --git a/android_webview/tools/gyp_webview b/android_webview/tools/gyp_webview | 
| index cfb9cc86e1e6efc8df6db710fe557a68e841a99f..b44bfed36e68f9870a948c95043b6a08e6764246 100755 | 
| --- a/android_webview/tools/gyp_webview | 
| +++ b/android_webview/tools/gyp_webview | 
| @@ -17,27 +17,30 @@ export CHROME_ANDROID_BUILD_WEBVIEW=1 | 
| export CHROME_SRC="$(readlink -f "$(dirname "$0")/../..")" | 
| export PYTHONDONTWRITEBYTECODE=1 | 
|  | 
| +FLAGS="-f android -Gdefault_target=All -Glimit_to_target_all=1 "\ | 
| +"${CHROME_SRC}/android_webview/all_webview.gyp" | 
| + | 
| if [ "$PLATFORM" == "linux-arm" -o "$PLATFORM" == "all" ]; then | 
| ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=arm --host-os=linux \ | 
| -    && android_gyp --suffix .linux-arm ) | 
| +    && android_gyp --suffix .linux-arm ${FLAGS} ) | 
| fi | 
| if [ "$PLATFORM" == "linux-x86" -o "$PLATFORM" == "all" ]; then | 
| ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=x86 --host-os=linux \ | 
| -    && android_gyp --suffix .linux-x86 ) | 
| +    && android_gyp --suffix .linux-x86 ${FLAGS} ) | 
| fi | 
| if [ "$PLATFORM" == "linux-mips" -o "$PLATFORM" == "all" ]; then | 
| ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=mips --host-os=linux \ | 
| -    && android_gyp --suffix .linux-mips ) | 
| +    && android_gyp --suffix .linux-mips ${FLAGS} ) | 
| fi | 
| if [ "$PLATFORM" == "darwin-arm" -o "$PLATFORM" == "all" ]; then | 
| ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=arm --host-os=mac \ | 
| -    && android_gyp --suffix .darwin-arm ) | 
| +    && android_gyp --suffix .darwin-arm ${FLAGS} ) | 
| fi | 
| if [ "$PLATFORM" == "darwin-x86" -o "$PLATFORM" == "all" ]; then | 
| ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=x86 --host-os=mac \ | 
| -    && android_gyp --suffix .darwin-x86 ) | 
| +    && android_gyp --suffix .darwin-x86 ${FLAGS} ) | 
| fi | 
| if [ "$PLATFORM" == "darwin-mips" -o "$PLATFORM" == "all" ]; then | 
| ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=mips --host-os=mac \ | 
| -    && android_gyp --suffix .darwin-mips ) | 
| +    && android_gyp --suffix .darwin-mips ${FLAGS} ) | 
| fi | 
|  |