aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools/android/bin
diff options
context:
space:
mode:
Diffstat (limited to 'platform_tools/android/bin')
-rwxr-xr-xplatform_tools/android/bin/android_setup.sh2
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}"
}