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

Unified Diff: platform_tools/android/gyp/skia_android.gypi

Issue 916113002: Don't use m32 cflag for x86_64. (Closed) Base URL: https://skia.googlesource.com/skia.git@baselijne
Patch Set: Make desktops distinguish between x86 and x86_64 Created 5 years, 10 months 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 | « platform_tools/android/bin/gyp_to_android.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: platform_tools/android/gyp/skia_android.gypi
diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi
index 210a61a13f758d968aa3e42ad15355e06893b669..ace21ccae7a03e9492b4076601bebd72fb9dac5d 100644
--- a/platform_tools/android/gyp/skia_android.gypi
+++ b/platform_tools/android/gyp/skia_android.gypi
@@ -1,3 +1,4 @@
+#
{
'targets': [
{
@@ -18,10 +19,10 @@
[ 'skia_arch_type == "arm64"', {
'android_arch%': "arm64-v8a",
}],
- [ 'skia_arch_type == "x86" and skia_arch_width == 32', {
+ [ 'skia_arch_type == "x86"', {
'android_arch%': "x86",
}],
- [ 'skia_arch_type == "x86" and skia_arch_width == 64', {
+ [ 'skia_arch_type == "x86_64"', {
'android_arch%': "x86_64",
}],
[ 'skia_arch_type == "mips" and skia_arch_width == 32', {
« no previous file with comments | « platform_tools/android/bin/gyp_to_android.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698