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

Unified Diff: base/base.gypi

Issue 10198027: enable android x86 build (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: patch updated to address review issues Created 8 years, 8 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 | « no previous file | build/android/envsetup.sh » ('j') | build/android/envsetup.sh » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index 74899b2b962f53846d18279be546efed37f67cbe..c47823e003cc815220053d057617e0e6e180d3be 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -677,6 +677,13 @@
],
}],
[ 'OS == "android" and _toolset == "target"', {
+ 'conditions': [
+ ['target_arch == "ia32"', {
+ 'sources/': [
Paweł Hajdan Jr. 2012/04/27 06:56:19 nit: Why don't you just use 'sources!' instead?
Wei James 2012/04/27 08:59:05 this code is just copied from above line#658. do y
Paweł Hajdan Jr. 2012/04/27 09:40:06 Ah right, it's "include" so just "sources" please.
+ ['include', '^atomicops_internals_x86_gcc\\.cc$'],
+ ],
+ }],
+ ],
'dependencies': [
'symbolize',
'../third_party/ashmem/ashmem.gyp:ashmem',
« no previous file with comments | « no previous file | build/android/envsetup.sh » ('j') | build/android/envsetup.sh » ('J')

Powered by Google App Engine
This is Rietveld 408576698