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

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: 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 | 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 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 'action': [ 541 'action': [
542 '<!(/bin/echo -n $STRIP)', 542 '<!(/bin/echo -n $STRIP)',
543 '--strip-unneeded', # All symbols not needed for relocation. 543 '--strip-unneeded', # All symbols not needed for relocation.
544 '<@(_inputs)', 544 '<@(_inputs)',
545 '-o', 545 '-o',
546 '<@(_outputs)' 546 '<@(_outputs)'
547 ], 547 ],
548 }, 548 },
549 { 549 {
550 'action_name': 'content_shell_apk', 550 'action_name': 'content_shell_apk',
551 'variables': {
552 # Pass the build type to ant. Currently it only assumes
553 # debug mode in java. Release mode will break the current
554 # workflow.
555 # TODO(yongsheng): enable it once the workflow is ready
556 # to support release mode.
557 # 'ant_build_type%': '`if [ "<(CONFIGURATION_NAME)" = "Debug" ]; then echo "debug"; elif [ "<(CONFIGURATION_NAME)" = "Release" ]; then echo "rel ease"; fi;`',
John Grabowski 2012/06/26 19:30:37 <!(cmd) instead of backticks
yongsheng 2012/06/27 03:36:04 seems not workable. Because the gyp will execute i
John Grabowski 2012/06/27 16:45:58 Can you explain why it's a problem in a mk file?
558 },
551 'inputs': [ 559 'inputs': [
552 '<(DEPTH)/content/shell/android/content_shell_apk.xml', 560 '<(DEPTH)/content/shell/android/content_shell_apk.xml',
553 '<(DEPTH)/content/shell/android/AndroidManifest.xml', 561 '<(DEPTH)/content/shell/android/AndroidManifest.xml',
554 '<!@(find shell/android/java -name "*.java")', 562 '<!@(find shell/android/java -name "*.java")',
555 '<!@(find shell/android/res -name "*")', 563 '<!@(find shell/android/res -name "*")',
556 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_base.jar', 564 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_base.jar',
557 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_net.jar', 565 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_net.jar',
558 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_media.jar', 566 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_media.jar',
559 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_content.jar', 567 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_content.jar',
560 '<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent _shell_content_view.so', 568 '<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent _shell_content_view.so',
561 ], 569 ],
562 'outputs': [ 570 'outputs': [
563 # Awkwardly, we build a Debug APK even when gyp is in 571 # Awkwardly, we build a Debug APK even when gyp is in
564 # Release mode. I don't think it matters (e.g. we're 572 # Release mode. I don't think it matters (e.g. we're
565 # probably happy to not codesign) but naming should be 573 # probably happy to not codesign) but naming should be
566 # fixed. 574 # fixed.
567 '<(PRODUCT_DIR)/ContentShell-debug.apk', 575 '<(PRODUCT_DIR)/ContentShell-debug.apk',
568 ], 576 ],
569 'action': [ 577 'action': [
570 'ant', 578 'ant',
571 '-DPRODUCT_DIR=<(ant_build_out)', 579 '-DPRODUCT_DIR=<(ant_build_out)',
572 '-DAPP_ABI=<(android_app_abi)', 580 '-DAPP_ABI=<(android_app_abi)',
573 '-buildfile', 581 '-buildfile',
574 '<(DEPTH)/content/shell/android/content_shell_apk.xml', 582 '<(DEPTH)/content/shell/android/content_shell_apk.xml',
583 # '<(ant_build_type)',
Mark Mentovai 2012/06/28 14:24:18 Why not just <(CONFIGURATION_NAME) here? It’s awfu
yongsheng 2012/06/29 02:01:46 Thanks for your comments. How about replacing it w
Mark Mentovai 2012/06/29 02:03:54 Again, backticks aren’t guaranteed to work. I gave
yongsheng 2012/06/29 02:08:21 yes, i see. Thanks. If it doesn't work, any hint a
Mark Mentovai 2012/06/29 03:20:18 #!/bin/bash set -eu buildtype="$(tr '[A-Z]' '[a-z]
575 ] 584 ]
576 } 585 }
577 ], 586 ],
578 }, 587 },
579 ], 588 ],
580 }], # OS=="android" 589 }], # OS=="android"
581 ] 590 ]
582 } 591 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698