Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Unified Diff: platform_tools/android/bin/android_setup.sh

Issue 51003007: Make it possible to pass GYP_DEFINES to Android builds (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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}"
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698