diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-05 15:03:19 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-05 15:03:19 +0000 |
| commit | ecdb6b326f416d945044d1f4be0f2b7ee7335f3a (patch) | |
| tree | aa6cbe013b8c416f91c1ee8450eb7ccff8235b2b /platform_tools | |
| parent | d3e5842db0cb169e10d6da1e62c94ba5cf182bb4 (diff) | |
Make it possible to pass GYP_DEFINES to Android builds
Pass possibly existing GYP_DEFINES from shell to gyp when building
for Android. Makes it possible to use custom build flags such as
skia_nv_path_rendering=1.
R=djsollen@google.com
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/51003007
git-svn-id: http://skia.googlecode.com/svn/trunk@12128 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_setup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh index ee74c0140b..a2a5c318e4 100755 --- a/platform_tools/android/bin/android_setup.sh +++ b/platform_tools/android/bin/android_setup.sh @@ -243,7 +243,7 @@ setup_device() { fi DEFINES="${DEFINES} android_toolchain=${TOOLCHAIN_TYPE}" - exportVar GYP_DEFINES "$DEFINES" + exportVar GYP_DEFINES "$DEFINES $GYP_DEFINES" exportVar SKIA_OUT "out/config/android-${TARGET_DEVICE}" } |