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

Side by Side Diff: base/base.gypi

Issue 10310029: Reapply "Changes according to review comments" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use StartsWith Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « base/base.gyp ('k') | build/all_android.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'base_target': 0, 8 'base_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 21 matching lines...) Expand all
32 'android/jni_android.cc', 32 'android/jni_android.cc',
33 'android/jni_android.h', 33 'android/jni_android.h',
34 'android/jni_array.cc', 34 'android/jni_array.cc',
35 'android/jni_array.h', 35 'android/jni_array.h',
36 'android/jni_helper.cc', 36 'android/jni_helper.cc',
37 'android/jni_helper.h', 37 'android/jni_helper.h',
38 'android/jni_registrar.cc', 38 'android/jni_registrar.cc',
39 'android/jni_registrar.h', 39 'android/jni_registrar.h',
40 'android/jni_string.cc', 40 'android/jni_string.cc',
41 'android/jni_string.h', 41 'android/jni_string.h',
42 'android/locale_utils.cc',
43 'android/locale_utils.h',
42 'android/path_utils.cc', 44 'android/path_utils.cc',
43 'android/path_utils.h', 45 'android/path_utils.h',
44 'at_exit.cc', 46 'at_exit.cc',
45 'at_exit.h', 47 'at_exit.h',
46 'atomic_ref_count.h', 48 'atomic_ref_count.h',
47 'atomic_sequence_num.h', 49 'atomic_sequence_num.h',
48 'atomicops.h', 50 'atomicops.h',
49 'atomicops_internals_x86_gcc.cc', 51 'atomicops_internals_x86_gcc.cc',
50 'atomicops_internals_x86_gcc.h', 52 'atomicops_internals_x86_gcc.h',
51 'atomicops_internals_x86_msvc.h', 53 'atomicops_internals_x86_msvc.h',
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 'conditions': [ 691 'conditions': [
690 ['target_arch == "ia32"', { 692 ['target_arch == "ia32"', {
691 'sources/': [ 693 'sources/': [
692 ['include', '^atomicops_internals_x86_gcc\\.cc$'], 694 ['include', '^atomicops_internals_x86_gcc\\.cc$'],
693 ], 695 ],
694 }], 696 }],
695 ], 697 ],
696 'dependencies': [ 698 'dependencies': [
697 'symbolize', 699 'symbolize',
698 '../third_party/ashmem/ashmem.gyp:ashmem', 700 '../third_party/ashmem/ashmem.gyp:ashmem',
701 '../third_party/icu/icu.gyp:icuuc',
699 'base_java', 702 'base_java',
700 'base_jni_headers', 703 'base_jni_headers',
701 ], 704 ],
702 'include_dirs': [ 705 'include_dirs': [
703 '<(SHARED_INTERMEDIATE_DIR)/base', 706 '<(SHARED_INTERMEDIATE_DIR)/base',
704 ], 707 ],
705 'link_settings': { 708 'link_settings': {
706 'libraries': [ 709 'libraries': [
707 '-llog', 710 '-llog',
708 ], 711 ],
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
935 'third_party/xdg_mime/xdgmimemagic.c', 938 'third_party/xdg_mime/xdgmimemagic.c',
936 'third_party/xdg_mime/xdgmimemagic.h', 939 'third_party/xdg_mime/xdgmimemagic.h',
937 'third_party/xdg_mime/xdgmimeparent.c', 940 'third_party/xdg_mime/xdgmimeparent.c',
938 'third_party/xdg_mime/xdgmimeparent.h', 941 'third_party/xdg_mime/xdgmimeparent.h',
939 ], 942 ],
940 }, 943 },
941 ], 944 ],
942 }], 945 }],
943 ], 946 ],
944 } 947 }
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | build/all_android.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698