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

Side by Side Diff: chrome/android/chrome_apk.gyp

Issue 1818423003: Revert of Remove configuration policy from chrome build files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@policy_chrome_defines
Patch Set: Created 4 years, 9 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 | « chrome/android/BUILD.gn ('k') | chrome/android/chrome_public_apk_tmpl.gni » ('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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 'includes': [ 5 'includes': [
6 '../../chrome/chrome_android_paks.gypi', # Included for the list of pak reso urces. 6 '../../chrome/chrome_android_paks.gypi', # Included for the list of pak reso urces.
7 '../../build/util/version.gypi' 7 '../../build/util/version.gypi'
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'chromium_code': 1, 10 'chromium_code': 1,
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 }, 155 },
156 { 156 {
157 # GN: //chrome/android:chrome_public_apk_manifest 157 # GN: //chrome/android:chrome_public_apk_manifest
158 'target_name': 'chrome_public_manifest', 158 'target_name': 'chrome_public_manifest',
159 'type': 'none', 159 'type': 'none',
160 'variables': { 160 'variables': {
161 'jinja_inputs': ['java/AndroidManifest.xml'], 161 'jinja_inputs': ['java/AndroidManifest.xml'],
162 'jinja_output': '<(chrome_public_apk_manifest)', 162 'jinja_output': '<(chrome_public_apk_manifest)',
163 'jinja_variables': [ 163 'jinja_variables': [
164 'channel=<(android_channel)', 164 'channel=<(android_channel)',
165 'configuration_policy=<(configuration_policy)',
165 'manifest_package=<(manifest_package)', 166 'manifest_package=<(manifest_package)',
166 'min_sdk_version=16', 167 'min_sdk_version=16',
167 'target_sdk_version=23', 168 'target_sdk_version=23',
168 ], 169 ],
169 }, 170 },
170 'includes': [ '../../build/android/jinja_template.gypi' ], 171 'includes': [ '../../build/android/jinja_template.gypi' ],
171 }, 172 },
172 { 173 {
173 # GN: //chrome/android:chrome_sync_shell_apk_manifest 174 # GN: //chrome/android:chrome_sync_shell_apk_manifest
174 'target_name': 'chrome_sync_shell_apk_manifest', 175 'target_name': 'chrome_sync_shell_apk_manifest',
175 'type': 'none', 176 'type': 'none',
176 'variables': { 177 'variables': {
177 'jinja_inputs': ['java/AndroidManifest.xml'], 178 'jinja_inputs': ['java/AndroidManifest.xml'],
178 'jinja_output': '<(chrome_sync_shell_apk_manifest)', 179 'jinja_output': '<(chrome_sync_shell_apk_manifest)',
179 'jinja_variables': [ 180 'jinja_variables': [
180 'channel=<(android_channel)', 181 'channel=<(android_channel)',
182 'configuration_policy=<(configuration_policy)',
181 'manifest_package=<(sync_shell_manifest_package)', 183 'manifest_package=<(sync_shell_manifest_package)',
182 'min_sdk_version=16', 184 'min_sdk_version=16',
183 'target_sdk_version=22', 185 'target_sdk_version=22',
184 ], 186 ],
185 }, 187 },
186 'includes': [ '../../build/android/jinja_template.gypi' ], 188 'includes': [ '../../build/android/jinja_template.gypi' ],
187 }, 189 },
188 { 190 {
189 # GN: //chrome/android:chrome_public_apk 191 # GN: //chrome/android:chrome_public_apk
190 'target_name': 'chrome_public_apk', 192 'target_name': 'chrome_public_apk',
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 } 424 }
423 ], 425 ],
424 ], 426 ],
425 } 427 }
426 428
427 # Local Variables: 429 # Local Variables:
428 # tab-width:2 430 # tab-width:2
429 # indent-tabs-mode:nil 431 # indent-tabs-mode:nil
430 # End: 432 # End:
431 # vim: set expandtab tabstop=2 shiftwidth=2: 433 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/chrome_public_apk_tmpl.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698