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

Side by Side Diff: content/content_shell.gypi

Issue 11363131: Specify jar name for apks in java_apk.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 1 month 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/chrome_android.gypi ('k') | 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 { 5 {
6 'variables': { 6 'variables': {
7 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 ['android_build_type==1', { 578 ['android_build_type==1', {
579 'ldflags': [ 579 'ldflags': [
580 '-lgabi++', # For rtti 580 '-lgabi++', # For rtti
581 ], 581 ],
582 }], 582 }],
583 ], 583 ],
584 }, 584 },
585 { 585 {
586 # content_shell_apk creates a .jar as a side effect. Any java targets 586 # content_shell_apk creates a .jar as a side effect. Any java targets
587 # that need that .jar in their classpath should depend on this target, 587 # that need that .jar in their classpath should depend on this target,
588 # content_shell_java. 588 # content_shell_java. Direct dependents of content_shell_apk receive
589 # its jar path in the variable 'apk_output_jar_path'.
Yaron 2012/11/08 02:22:57 Isn't this "All dependents"?
cjhopman 2012/11/14 23:32:53 Done.
589 'target_name': 'content_shell_java', 590 'target_name': 'content_shell_java',
590 'type': 'none', 591 'type': 'none',
591 'variables': {
592 'output_jar': '<(PRODUCT_DIR)/lib.java/chromium_apk_content_shell.ja r'
593 },
594 'outputs': ['<(output_jar)'],
595 'dependencies': [ 592 'dependencies': [
596 'content_java',
597 'content_shell_apk', 593 'content_shell_apk',
598 '../base/base.gyp:base_java',
599 '../media/media.gyp:media_java',
600 '../net/net.gyp:net_java',
601 '../ui/ui.gyp:ui_java',
602 ], 594 ],
603 # This all_dependent_settings is used for java targets only. This will 595 # This all_dependent_settings is used for java targets only. This will
604 # add the content_shell jar to the classpath of dependent java 596 # add the content_shell jar to the classpath of dependent java
605 # targets. 597 # targets.
606 'all_dependent_settings': { 598 'all_dependent_settings': {
607 'variables': { 599 'variables': {
608 'input_jars_paths': ['<(output_jar)'], 600 'input_jars_paths': ['>(apk_output_jar_path)'],
609 }, 601 },
610 }, 602 },
611 # Add an action with the appropriate output. This allows the generated 603 # Add an action with the appropriate output. This allows the generated
612 # buildfiles to determine which target the output corresponds to. 604 # buildfiles to determine which target the output corresponds to.
613 'actions': [ 605 'actions': [
614 { 606 {
615 'action_name': 'fake_generate_jar', 607 'action_name': 'fake_generate_jar',
616 'inputs': [], 608 'inputs': [],
617 'outputs': ['<(output_jar)'], 609 'outputs': ['>(apk_output_jar_path)'],
618 'action': [], 610 'action': [],
619 }, 611 },
620 ], 612 ],
621 }, 613 },
622 { 614 {
623 'target_name': 'content_shell_apk', 615 'target_name': 'content_shell_apk',
624 'type': 'none', 616 'type': 'none',
625 'dependencies': [ 617 'dependencies': [
626 'content_java', 618 'content_java',
627 '../base/base.gyp:base_java', 619 '../base/base.gyp:base_java',
(...skipping 11 matching lines...) Expand all
639 'resource_dir': '../res', 631 'resource_dir': '../res',
640 'native_libs_paths': ['<(SHARED_LIB_DIR)/libcontent_shell_content_vi ew.so'], 632 'native_libs_paths': ['<(SHARED_LIB_DIR)/libcontent_shell_content_vi ew.so'],
641 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 633 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
642 }, 634 },
643 'includes': [ '../build/java_apk.gypi' ], 635 'includes': [ '../build/java_apk.gypi' ],
644 }, 636 },
645 ], 637 ],
646 }], # OS=="android" 638 }], # OS=="android"
647 ] 639 ]
648 } 640 }
OLDNEW
« no previous file with comments | « chrome/chrome_android.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698