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

Unified Diff: base/base.gypi

Issue 8429034: Upstream: Build net_unittests for Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 2 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/all_android.gyp » ('j') | build/all_android.gyp » ('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 dd99be3969898cd33610c2c100a44f77e99e8ae9..1c0b7649b5b106f7151aac78f3b05b1857004af1 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -437,8 +437,7 @@
],
[ 'OS == "android"', {
'sources/': [
- ['exclude', '^debug/stack_trace.cc'],
- ['exclude', '^debug/stack_trace_posix.cc'],
+ ['exclude', '^files/file_path_watcher_kqueue.cc'],
John Grabowski 2011/11/01 23:09:34 I landed a fix for this today; see http://coderevi
Jing Zhao 2011/11/02 16:22:55 Removed.
['exclude', '^system_monitor/system_monitor_posix.cc'],
['include', '^native_library_linux.cc'],
['include', '^process_util_linux.cc'],
@@ -595,16 +594,25 @@
'defines': [
'USE_SYMBOLIZE',
],
- 'link_settings': {
- 'libraries': [
- '-llog',
- ],
- },
'conditions': [
[ '_toolset=="host" and host_os=="linux"', {
'dependencies': [
'../build/linux/system.gyp:glib',
],
+ 'sources/': [
+ ['include', 'atomicops_internals_x86_gcc.cc'],
+ ],
+ }],
+ [ '_toolset=="target"', {
+ 'sources/': [
+ ['exclude', '^debug/stack_trace.cc'],
+ ['exclude', '^debug/stack_trace_posix.cc'],
michaelbai 2011/11/01 16:37:59 It seemed that this 'reg' way is not preferred, yo
Jing Zhao 2011/11/02 16:22:55 Done.
+ ],
+ 'link_settings': {
+ 'libraries': [
+ '-llog',
+ ],
+ }
}],
],
}],
« no previous file with comments | « no previous file | build/all_android.gyp » ('j') | build/all_android.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698