| Index: platform_tools/android/bin/android_setup.sh
 | 
| diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh
 | 
| index ee74c0140bcaf5546c38cbd718fb040595781c95..a2a5c318e46b9b4ba533111a34c7b962ab0dd9ad 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}"
 | 
|  }
 | 
|  
 | 
| 
 |