Chromium Code Reviews| Index: build/uiautomator_test.gypi |
| diff --git a/build/java_prebuilt.gypi b/build/uiautomator_test.gypi |
| similarity index 55% |
| copy from build/java_prebuilt.gypi |
| copy to build/uiautomator_test.gypi |
| index 57255e16094fbf1b1d68821e9eeef41fbcc681bc..276b6a5161f04bbcfc173dfbcb90b491bbac49a1 100644 |
| --- a/build/java_prebuilt.gypi |
| +++ b/build/uiautomator_test.gypi |
| @@ -1,35 +1,24 @@ |
| -# Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| +# Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| # Use of this source code is governed by a BSD-style license that can be |
| # found in the LICENSE file. |
| # This file is meant to be included into a target to provide a rule |
| -# to package prebuilt Java JARs in a consistent manner. |
| +# to build uiautomator dexed tests jar. |
| # |
| # To use this, create a gyp target with the following form: |
| # { |
| -# 'target_name': 'my-package_java', |
| +# 'target_name': 'test_suite_name', |
| # 'type': 'none', |
| -# 'variables': { |
| -# 'jar_path': 'path/to/your.jar', |
| -# }, |
| # 'includes': ['path/to/this/gypi/file'], |
| # } |
| # |
| -# Required variables: |
| -# jar_path - The path to the prebuilt Java JAR file. |
| { |
| 'dependencies': [ |
| - '<(DEPTH)/build/build_output_dirs_android.gyp:build_output_dirs' |
| + '<(DEPTH)/tools/android/android_tools.gyp:android_tools', |
| ], |
| 'variables': { |
| - 'dex_path': '<(PRODUCT_DIR)/lib.java/<(_target_name).dex.jar', |
| - }, |
| - 'all_dependent_settings': { |
| - 'variables': { |
| - 'input_jars_paths': ['<(jar_path)'], |
| - 'library_dexed_jars_paths': ['<(dex_path)'], |
| - }, |
| + 'output_dex_path': '<(PRODUCT_DIR)/lib.java/<(_target_name).dex.jar', |
| }, |
| 'actions': [ |
| { |
| @@ -38,22 +27,21 @@ |
| 'inputs': [ |
| '<(DEPTH)/build/android/pylib/build_utils.py', |
| '<(DEPTH)/build/android/dex.py', |
| - '<(jar_path)', |
| + '>@(library_dexed_jars_paths)', |
| ], |
| 'outputs': [ |
| - '<(dex_path)', |
| + '<(output_dex_path)', |
| ], |
| 'action': [ |
| 'python', '<(DEPTH)/build/android/dex.py', |
| - '--dex-path=<(dex_path)', |
| + '--dex-path=<(output_dex_path)', |
| '--android-sdk-root=<(android_sdk_root)', |
| # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja. |
| '--ignore=>!(echo \'>(_inputs)\' | md5sum)', |
|
Nico
2014/01/30 05:19:26
Since library_dexed_jars_paths is passed as parame
|
| - '<(jar_path)', |
| - ] |
| + '>@(library_dexed_jars_paths)', |
| + ], |
| }, |
| - |
| ], |
| } |