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

Side by Side Diff: content/content_shell.gypi

Issue 10669030: Pass the build type to ant build (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebase Created 8 years, 5 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 | « no previous file | content/shell/content_shell_ant_helper.sh » ('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 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 '<!(/bin/echo -n $STRIP)', 579 '<!(/bin/echo -n $STRIP)',
580 '--strip-unneeded', # All symbols not needed for relocation. 580 '--strip-unneeded', # All symbols not needed for relocation.
581 '<@(_inputs)', 581 '<@(_inputs)',
582 '-o', 582 '-o',
583 '<@(_outputs)', 583 '<@(_outputs)',
584 ], 584 ],
585 }, 585 },
586 { 586 {
587 'action_name': 'content_shell_apk', 587 'action_name': 'content_shell_apk',
588 'inputs': [ 588 'inputs': [
589 '<(DEPTH)/content/shell/android/java/content_shell_apk.xml', 589 'shell/android/java/content_shell_apk.xml',
590 '<(DEPTH)/content/shell/android/java/AndroidManifest.xml', 590 'shell/android/java/AndroidManifest.xml',
591 '<!@(find shell/android/java -name "*.java")', 591 '<!@(find shell/android/java -name "*.java")',
592 '<!@(find shell/android/res -name "*")', 592 '<!@(find shell/android/res -name "*")',
593 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_base.jar', 593 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_base.jar',
594 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_net.jar', 594 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_net.jar',
595 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_media.jar', 595 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_media.jar',
596 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_content.jar', 596 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_content.jar',
597 '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak', 597 '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
598 '<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent _shell_content_view.so', 598 '<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent _shell_content_view.so',
599 ], 599 ],
600 'outputs': [ 600 'outputs': [
601 # Awkwardly, we build a Debug APK even when gyp is in 601 # Awkwardly, we build a Debug APK even when gyp is in
602 # Release mode. I don't think it matters (e.g. we're 602 # Release mode. I don't think it matters (e.g. we're
603 # probably happy to not codesign) but naming should be 603 # probably happy to not codesign) but naming should be
604 # fixed. 604 # fixed.
605 '<(PRODUCT_DIR)/content_shell/ContentShell-debug.apk', 605 '<(PRODUCT_DIR)/content_shell/ContentShell-debug.apk',
606 ], 606 ],
607 'action': [ 607 'action': [
608 # Pass the build type to ant. Currently it only assumes
609 # debug mode in java. Release mode will break the current
610 # workflow.
611 # 'shell/content_shell_ant_helper.sh',
608 'ant', 612 'ant',
609 '-DPRODUCT_DIR=<(ant_build_out)', 613 '-DPRODUCT_DIR=<(ant_build_out)',
610 '-DAPP_ABI=<(android_app_abi)', 614 '-DAPP_ABI=<(android_app_abi)',
611 '-buildfile', 615 '-buildfile',
612 '<(DEPTH)/content/shell/android/java/content_shell_apk.xml', 616 'shell/android/java/content_shell_apk.xml',
617 # '<(CONFIGURATION_NAME)',
613 ] 618 ]
614 } 619 }
615 ], 620 ],
616 }, 621 },
617 { 622 {
618 'target_name': 'content_shell_test_apk', 623 'target_name': 'content_shell_test_apk',
619 'type': 'none', 624 'type': 'none',
620 'dependencies': [ 625 'dependencies': [
621 'content_shell_apk', 626 'content_shell_apk',
622 ], 627 ],
(...skipping 14 matching lines...) Expand all
637 '-buildfile', 642 '-buildfile',
638 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk .xml', 643 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk .xml',
639 ] 644 ]
640 } 645 }
641 ], 646 ],
642 }, 647 },
643 ], 648 ],
644 }], # OS=="android" 649 }], # OS=="android"
645 ] 650 ]
646 } 651 }
OLDNEW
« no previous file with comments | « no previous file | content/shell/content_shell_ant_helper.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698