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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « platform_tools/android/bin/gyp_to_android.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #
1 { 2 {
2 'targets': [ 3 'targets': [
3 { 4 {
4 'target_name': 'CopySampleAppDeps', 5 'target_name': 'CopySampleAppDeps',
5 'type': 'none', 6 'type': 'none',
6 'dependencies': [ 7 'dependencies': [
7 'skia_lib.gyp:skia_lib', 8 'skia_lib.gyp:skia_lib',
8 'SampleApp.gyp:SampleApp', 9 'SampleApp.gyp:SampleApp',
9 ], 10 ],
10 'variables': { 11 'variables': {
11 'conditions': [ 12 'conditions': [
12 [ 'skia_arch_type == "arm" and arm_version != 7', { 13 [ 'skia_arch_type == "arm" and arm_version != 7', {
13 'android_arch%': "armeabi", 14 'android_arch%': "armeabi",
14 }], 15 }],
15 [ 'skia_arch_type == "arm" and arm_version == 7', { 16 [ 'skia_arch_type == "arm" and arm_version == 7', {
16 'android_arch%': "armeabi-v7a", 17 'android_arch%': "armeabi-v7a",
17 }], 18 }],
18 [ 'skia_arch_type == "arm64"', { 19 [ 'skia_arch_type == "arm64"', {
19 'android_arch%': "arm64-v8a", 20 'android_arch%': "arm64-v8a",
20 }], 21 }],
21 [ 'skia_arch_type == "x86" and skia_arch_width == 32', { 22 [ 'skia_arch_type == "x86"', {
22 'android_arch%': "x86", 23 'android_arch%': "x86",
23 }], 24 }],
24 [ 'skia_arch_type == "x86" and skia_arch_width == 64', { 25 [ 'skia_arch_type == "x86_64"', {
25 'android_arch%': "x86_64", 26 'android_arch%': "x86_64",
26 }], 27 }],
27 [ 'skia_arch_type == "mips" and skia_arch_width == 32', { 28 [ 'skia_arch_type == "mips" and skia_arch_width == 32', {
28 'android_arch%': "mips", 29 'android_arch%': "mips",
29 }], 30 }],
30 [ 'skia_arch_type == "mips" and skia_arch_width == 64', { 31 [ 'skia_arch_type == "mips" and skia_arch_width == 64', {
31 'android_arch%': "mips64", 32 'android_arch%': "mips64",
32 }], 33 }],
33 ], 34 ],
34 }, 35 },
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 '-Dnative.libs.absolute.dir=<(ANDROID_OUT)/libs', 94 '-Dnative.libs.absolute.dir=<(ANDROID_OUT)/libs',
94 '-Dout.final.file=<(ANDROID_OUT)/bin/SkiaAndroid.apk', 95 '-Dout.final.file=<(ANDROID_OUT)/bin/SkiaAndroid.apk',
95 '-Dsdk.dir=<(ANDROID_SDK_ROOT)', 96 '-Dsdk.dir=<(ANDROID_SDK_ROOT)',
96 'debug', 97 'debug',
97 ], 98 ],
98 }, 99 },
99 ], 100 ],
100 }, 101 },
101 ], 102 ],
102 } 103 }
OLDNEW
« 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