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

Side by Side Diff: chrome/chrome_android.gypi

Issue 325293002: Add 'enhanced_bookmarks' dependency to 'chrome_android_core'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: TODO Created 6 years, 6 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 | « no previous file | 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 # 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 'package_name': 'chrome_shell_apk', 7 'package_name': 'chrome_shell_apk',
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'chrome_android_paks.gypi', # Included for the list of pak resources. 10 'chrome_android_paks.gypi', # Included for the list of pak resources.
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 }, 91 },
92 { 92 {
93 'target_name': 'chrome_android_core', 93 'target_name': 'chrome_android_core',
94 'type': 'static_library', 94 'type': 'static_library',
95 'dependencies': [ 95 'dependencies': [
96 'chrome.gyp:browser', 96 'chrome.gyp:browser',
97 'chrome.gyp:browser_ui', 97 'chrome.gyp:browser_ui',
98 'chrome.gyp:plugin', 98 'chrome.gyp:plugin',
99 'chrome.gyp:renderer', 99 'chrome.gyp:renderer',
100 'chrome.gyp:utility', 100 'chrome.gyp:utility',
101 # TODO(kkimlabs): Move this to chrome.gyp:browser when the dependent
102 # is upstreamed.
103 '../components/components.gyp:enhanced_bookmarks',
101 '../content/content.gyp:content', 104 '../content/content.gyp:content',
102 '../content/content.gyp:content_app_browser', 105 '../content/content.gyp:content_app_browser',
103 ], 106 ],
104 'include_dirs': [ 107 'include_dirs': [
105 '..', 108 '..',
106 '<(android_ndk_include)', 109 '<(android_ndk_include)',
107 ], 110 ],
108 'sources': [ 111 'sources': [
109 'app/android/chrome_android_initializer.cc', 112 'app/android/chrome_android_initializer.cc',
110 'app/android/chrome_android_initializer.h', 113 'app/android/chrome_android_initializer.h',
(...skipping 20 matching lines...) Expand all
131 { 134 {
132 'destination': '<(chrome_android_pak_output_folder)', 135 'destination': '<(chrome_android_pak_output_folder)',
133 'files': [ 136 'files': [
134 '<@(chrome_android_pak_input_resources)', 137 '<@(chrome_android_pak_input_resources)',
135 ], 138 ],
136 } 139 }
137 ], 140 ],
138 }, 141 },
139 ], 142 ],
140 } 143 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698