Chromium Code Reviews| Index: build/config/android/rules.gni |
| diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni |
| index 5d0cb372388f729608e30c4c27e8dec2b8415e0d..5e718891ae41aa1332d0796ea42493a6d399cd02 100644 |
| --- a/build/config/android/rules.gni |
| +++ b/build/config/android/rules.gni |
| @@ -922,8 +922,6 @@ template("java_prebuilt") { |
| # |
| # dex_path: If set, the resulting .dex.jar file will be placed under this |
| # path. |
| -# standalone_dex_path: If set, a standalone .dex.jar containing the code from |
| -# the library and all dependencies will be placed under this path. |
| # |
| # |
| # Example |
| @@ -986,9 +984,6 @@ template("android_library") { |
| if (defined(invoker.dex_path)) { |
| dex_path = invoker.dex_path |
| } |
| - if (defined(invoker.standalone_dex_path)) { |
| - standalone_dex_path = invoker.standalone_dex_path |
| - } |
| supports_android = true |
| requires_android = true |
| @@ -1005,6 +1000,20 @@ template("android_library") { |
| } |
| } |
| +# Declare a target that packages a set of Java dependencies into a standalone |
| +# .dex.jar. |
| +# |
| +# Variables |
| +# deps: specifies the dependencies of this target. Android libraries and |
| +# resources in deps will be packaged into the resulting .dex.jar file. |
|
cjhopman
2014/12/09 19:00:35
nit: I don't think you get the resources
ppi
2014/12/09 19:13:07
Done.
|
| +# dex_path: location at which the output file will be put |
| +template("android_standalone_library") { |
| + deps_dex(target_name) { |
| + deps = invoker.deps |
| + dex_path = invoker.dex_path |
| + } |
| +} |
| + |
| # Declare an Android library target for a prebuilt jar |
| # |
| # This target creates an Android library containing java code and Android |