| OLD | NEW |
| 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 609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 620 '<(PRODUCT_DIR)/lib.java/chromium_media.jar', | 620 '<(PRODUCT_DIR)/lib.java/chromium_media.jar', |
| 621 '<(PRODUCT_DIR)/lib.java/chromium_net.jar', | 621 '<(PRODUCT_DIR)/lib.java/chromium_net.jar', |
| 622 '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak', | 622 '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak', |
| 623 '<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent
_shell_content_view.so', | 623 '<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent
_shell_content_view.so', |
| 624 ], | 624 ], |
| 625 'outputs': [ | 625 'outputs': [ |
| 626 # Awkwardly, we build a Debug APK even when gyp is in | 626 # Awkwardly, we build a Debug APK even when gyp is in |
| 627 # Release mode. I don't think it matters (e.g. we're | 627 # Release mode. I don't think it matters (e.g. we're |
| 628 # probably happy to not codesign) but naming should be | 628 # probably happy to not codesign) but naming should be |
| 629 # fixed. | 629 # fixed. |
| 630 '<(PRODUCT_DIR)/content_shell/ContentShell-debug.apk', | 630 '<(PRODUCT_DIR)/apks/ContentShell-debug.apk', |
| 631 '<(PRODUCT_DIR)/test.lib.java/ContentShell-debug.jar', |
| 631 ], | 632 ], |
| 632 'action': [ | 633 'action': [ |
| 633 # Pass the build type to ant. Currently it only assumes | 634 # Pass the build type to ant. Currently it only assumes |
| 634 # debug mode in java. Release mode will break the current | 635 # debug mode in java. Release mode will break the current |
| 635 # workflow. | 636 # workflow. |
| 636 'ant', | 637 'ant', |
| 637 '-DPRODUCT_DIR=<(ant_build_out)', | 638 '-DPRODUCT_DIR=<(ant_build_out)', |
| 638 '-DAPP_ABI=<(android_app_abi)', | 639 '-DAPP_ABI=<(android_app_abi)', |
| 639 '-DANDROID_SDK=<(android_sdk)', | 640 '-DANDROID_SDK=<(android_sdk)', |
| 640 '-DANDROID_SDK_ROOT=<(android_sdk_root)', | 641 '-DANDROID_SDK_ROOT=<(android_sdk_root)', |
| 641 '-DANDROID_SDK_TOOLS=<(android_sdk_tools)', | 642 '-DANDROID_SDK_TOOLS=<(android_sdk_tools)', |
| 642 '-DANDROID_SDK_VERSION=<(android_sdk_version)', | 643 '-DANDROID_SDK_VERSION=<(android_sdk_version)', |
| 643 '-DANDROID_GDBSERVER=<(android_gdbserver)', | 644 '-DANDROID_GDBSERVER=<(android_gdbserver)', |
| 644 '-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)', | 645 '-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)', |
| 646 '-DCHROMIUM_SRC=<(ant_build_out)/../..', |
| 645 '-buildfile', | 647 '-buildfile', |
| 646 'shell/android/java/content_shell_apk.xml', | 648 'shell/android/java/content_shell_apk.xml', |
| 647 ], | 649 ], |
| 648 'dependencies': [ | 650 'dependencies': [ |
| 649 'content_java', | 651 'content_java', |
| 650 ], | 652 ], |
| 651 } | 653 } |
| 652 ], | 654 ], |
| 653 }, | 655 }, |
| 654 ], | 656 ], |
| 655 }], # OS=="android" | 657 }], # OS=="android" |
| 656 ] | 658 ] |
| 657 } | 659 } |
| OLD | NEW |