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

Side by Side Diff: content/content.gyp

Issue 11308030: Use _target_name instead of package_name for java*.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@apk_jar
Patch Set: Created 7 years, 10 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 | « components/web_contents_delegate_android.gypi ('k') | content/content_shell.gypi » ('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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 'dependencies': ['content'], 286 'dependencies': ['content'],
287 }, 287 },
288 ], 288 ],
289 }], 289 }],
290 ['OS == "android"', { 290 ['OS == "android"', {
291 'targets': [ 291 'targets': [
292 { 292 {
293 'target_name': 'common_aidl', 293 'target_name': 'common_aidl',
294 'type': 'none', 294 'type': 'none',
295 'variables': { 295 'variables': {
296 'package_name': 'content',
297 'aidl_interface_file': 'public/android/java/src/org/chromium/content /common/common.aidl', 296 'aidl_interface_file': 'public/android/java/src/org/chromium/content /common/common.aidl',
298 }, 297 },
299 'sources': [ 298 'sources': [
300 'public/android/java/src/org/chromium/content/common/ISandboxedProce ssCallback.aidl', 299 'public/android/java/src/org/chromium/content/common/ISandboxedProce ssCallback.aidl',
301 'public/android/java/src/org/chromium/content/common/ISandboxedProce ssService.aidl', 300 'public/android/java/src/org/chromium/content/common/ISandboxedProce ssService.aidl',
302 ], 301 ],
303 'includes': [ '../build/java_aidl.gypi' ], 302 'includes': [ '../build/java_aidl.gypi' ],
304 }, 303 },
305 { 304 {
306 'target_name': 'content_java', 305 'target_name': 'content_java',
307 'type': 'none', 306 'type': 'none',
308 'dependencies': [ 307 'dependencies': [
309 '../base/base.gyp:base', 308 '../base/base.gyp:base',
310 '../media/media.gyp:media_java', 309 '../media/media.gyp:media_java',
311 '../net/net.gyp:net', 310 '../net/net.gyp:net',
312 '../ui/ui.gyp:ui_java', 311 '../ui/ui.gyp:ui_java',
313 'common_aidl', 312 'common_aidl',
314 'content_common', 313 'content_common',
315 'page_transition_types_java', 314 'page_transition_types_java',
316 ], 315 ],
317 'variables': { 316 'variables': {
318 'package_name': 'content',
319 'java_in_dir': '../content/public/android/java', 317 'java_in_dir': '../content/public/android/java',
320 'has_java_resources': 1, 318 'has_java_resources': 1,
321 'R_package': 'org.chromium.content', 319 'R_package': 'org.chromium.content',
322 'R_package_relpath': 'org/chromium/content', 320 'R_package_relpath': 'org/chromium/content',
323 'java_strings_grd': 'android_content_strings.grd', 321 'java_strings_grd': 'android_content_strings.grd',
324 }, 322 },
325 'conditions': [ 323 'conditions': [
326 ['android_build_type == 0', { 324 ['android_build_type == 0', {
327 'dependencies': [ 325 'dependencies': [
328 '../third_party/eyesfree/eyesfree.gyp:eyesfree_java', 326 '../third_party/eyesfree/eyesfree.gyp:eyesfree_java',
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 'include_dirs': [ 385 'include_dirs': [
388 '<(SHARED_INTERMEDIATE_DIR)/content', 386 '<(SHARED_INTERMEDIATE_DIR)/content',
389 ], 387 ],
390 }, 388 },
391 'includes': [ 'content_jni.gypi' ], 389 'includes': [ 'content_jni.gypi' ],
392 }, 390 },
393 ], 391 ],
394 }], # OS == "android" 392 }], # OS == "android"
395 ], 393 ],
396 } 394 }
OLDNEW
« no previous file with comments | « components/web_contents_delegate_android.gypi ('k') | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698