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

Side by Side Diff: content/content.gyp

Issue 11784028: Add VisibleForTesting to content/public/android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase with the latest VisibleForTesting addition. 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
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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 'public/android/java/src/org/chromium/content/common/ISandboxedProce ssService.aidl', 277 'public/android/java/src/org/chromium/content/common/ISandboxedProce ssService.aidl',
278 ], 278 ],
279 'includes': [ '../build/java_aidl.gypi' ], 279 'includes': [ '../build/java_aidl.gypi' ],
280 }, 280 },
281 { 281 {
282 'target_name': 'content_java', 282 'target_name': 'content_java',
283 'type': 'none', 283 'type': 'none',
284 'dependencies': [ 284 'dependencies': [
285 '../base/base.gyp:base', 285 '../base/base.gyp:base',
286 '../net/net.gyp:net', 286 '../net/net.gyp:net',
287 '../third_party/guava/guava.gyp:guava_javalib',
287 '../ui/ui.gyp:ui_java', 288 '../ui/ui.gyp:ui_java',
288 'common_aidl', 289 'common_aidl',
289 'content_common', 290 'content_common',
290 'page_transition_types_java', 291 'page_transition_types_java',
291 ], 292 ],
292 'variables': { 293 'variables': {
293 'package_name': 'content', 294 'package_name': 'content',
294 'java_in_dir': '../content/public/android/java', 295 'java_in_dir': '../content/public/android/java',
295 'has_java_resources': 1, 296 'has_java_resources': 1,
296 'R_package': 'org.chromium.content', 297 'R_package': 'org.chromium.content',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 'dependencies': [ 344 'dependencies': [
344 'surface_texture_jni_headers', 345 'surface_texture_jni_headers',
345 'surface_jni_headers', 346 'surface_jni_headers',
346 ], 347 ],
347 'includes': [ 'content_jni.gypi' ], 348 'includes': [ 'content_jni.gypi' ],
348 }, 349 },
349 ], 350 ],
350 }], # OS == "android" 351 }], # OS == "android"
351 ], 352 ],
352 } 353 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698