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

Side by Side Diff: content/content.gyp

Issue 11820058: Revert 176134 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 | « chrome/chrome.gyp ('k') | ui/ui.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 'variables': { 6 'variables': {
7 'chromium_code': 1, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)', 8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)',
9 'conditions': [ 9 'conditions': [
10 ['inside_chromium_build==0', { 10 ['inside_chromium_build==0', {
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 'common_aidl', 288 'common_aidl',
289 'content_common', 289 'content_common',
290 'page_transition_types_java', 290 'page_transition_types_java',
291 ], 291 ],
292 'variables': { 292 'variables': {
293 'package_name': 'content', 293 'package_name': 'content',
294 'java_in_dir': '../content/public/android/java', 294 'java_in_dir': '../content/public/android/java',
295 'has_java_resources': 1, 295 'has_java_resources': 1,
296 'R_package': 'org.chromium.content', 296 'R_package': 'org.chromium.content',
297 'R_package_relpath': 'org/chromium/content', 297 'R_package_relpath': 'org/chromium/content',
298 'java_strings_grd': 'android_content_strings.grd',
299 }, 298 },
300 'conditions': [ 299 'conditions': [
301 ['android_build_type == 0', { 300 ['android_build_type == 0', {
302 'dependencies': [ 301 'dependencies': [
303 '../third_party/eyesfree/eyesfree.gyp:eyesfree_java', 302 '../third_party/eyesfree/eyesfree.gyp:eyesfree_java',
304 '../third_party/guava/guava.gyp:guava_javalib', 303 '../third_party/guava/guava.gyp:guava_javalib',
305 ], 304 ],
306 }], 305 }],
307 ], 306 ],
308 'includes': [ '../build/java.gypi' ], 307 'includes': [ '../build/java.gypi' ],
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 'dependencies': [ 344 'dependencies': [
346 'surface_texture_jni_headers', 345 'surface_texture_jni_headers',
347 'surface_jni_headers', 346 'surface_jni_headers',
348 ], 347 ],
349 'includes': [ 'content_jni.gypi' ], 348 'includes': [ 'content_jni.gypi' ],
350 }, 349 },
351 ], 350 ],
352 }], # OS == "android" 351 }], # OS == "android"
353 ], 352 ],
354 } 353 }
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698