diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 15:41:11 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 15:41:11 +0000 |
| commit | b4fafab74a4536b062c37a43cb6ea684b0b63cb5 (patch) | |
| tree | be67824ae9c13b7d8aa7c1ea87a1acbe8146d2e6 /android_webview | |
| parent | dc3506fc12540f69717cf11045a540c6e4279fb2 (diff) | |
| download | chromium_src-b4fafab74a4536b062c37a43cb6ea684b0b63cb5.zip chromium_src-b4fafab74a4536b062c37a43cb6ea684b0b63cb5.tar.gz chromium_src-b4fafab74a4536b062c37a43cb6ea684b0b63cb5.tar.bz2 | |
aw: Allow gyp_webview to be run anywhere
Currently gyp_webview sources chromium envsetup.sh from current
directory, which means it must be run from chromium src. But we already
export this as CHROME_SRC, so use that as prefix.
BUG=
NOTRY=true
Review URL: https://codereview.chromium.org/112243003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rwxr-xr-x | android_webview/tools/gyp_webview | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/android_webview/tools/gyp_webview b/android_webview/tools/gyp_webview index 0dd7b5b..cfb9cc8 100755 --- a/android_webview/tools/gyp_webview +++ b/android_webview/tools/gyp_webview @@ -18,26 +18,26 @@ export CHROME_SRC="$(readlink -f "$(dirname "$0")/../..")" export PYTHONDONTWRITEBYTECODE=1 if [ "$PLATFORM" == "linux-arm" -o "$PLATFORM" == "all" ]; then - ( . build/android/envsetup.sh --target-arch=arm --host-os=linux && \ - android_gyp --suffix .linux-arm ) + ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=arm --host-os=linux \ + && android_gyp --suffix .linux-arm ) fi if [ "$PLATFORM" == "linux-x86" -o "$PLATFORM" == "all" ]; then - ( . build/android/envsetup.sh --target-arch=x86 --host-os=linux && \ - android_gyp --suffix .linux-x86 ) + ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=x86 --host-os=linux \ + && android_gyp --suffix .linux-x86 ) fi if [ "$PLATFORM" == "linux-mips" -o "$PLATFORM" == "all" ]; then - ( . build/android/envsetup.sh --target-arch=mips --host-os=linux && \ - android_gyp --suffix .linux-mips ) + ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=mips --host-os=linux \ + && android_gyp --suffix .linux-mips ) fi if [ "$PLATFORM" == "darwin-arm" -o "$PLATFORM" == "all" ]; then - ( . build/android/envsetup.sh --target-arch=arm --host-os=mac && \ - android_gyp --suffix .darwin-arm ) + ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=arm --host-os=mac \ + && android_gyp --suffix .darwin-arm ) fi if [ "$PLATFORM" == "darwin-x86" -o "$PLATFORM" == "all" ]; then - ( . build/android/envsetup.sh --target-arch=x86 --host-os=mac && \ - android_gyp --suffix .darwin-x86 ) + ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=x86 --host-os=mac \ + && android_gyp --suffix .darwin-x86 ) fi if [ "$PLATFORM" == "darwin-mips" -o "$PLATFORM" == "all" ]; then - ( . build/android/envsetup.sh --target-arch=mips --host-os=mac && \ - android_gyp --suffix .darwin-mips ) + ( . $CHROME_SRC/build/android/envsetup.sh --target-arch=mips --host-os=mac \ + && android_gyp --suffix .darwin-mips ) fi |