diff options
| author |  Andrew Pellegrini <apell@google.com> | 2016-06-22 20:46:21 +0000 |
|---|---|---|
| committer |  Lukacs Berki <lberki@google.com> | 2016-06-23 11:10:23 +0000 |
| commit | e1a4a812971f604d51bdf098b6117d9ba03da1c8 (patch) | |
| tree | d53b64a6f80fb82cfa43d65c9b3f2f73b9084cdf /src/test | |
| parent | 6105e2415faa0f36ec6ae3399d90e1a173ef7f58 (diff) | |
Adds the Android manifest merger as an option for android_binary rules. The merger that is used (legacy or android) is controlled by the manifest_merger attribute on android_binary and the default is controlled by the --android_manifest_merger flag.
RELNOTES: The Android manifest merger is now available as an option for android_binary rules. The merger will honor tools annotations in AndroidManifest.xml and will perform placeholder substitutions using the values specified in android_binary.manifest_values. The merger may be selected by setting the manifest_merger attribute on android_binary.
--
MOS_MIGRATED_REVID=125603954
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java index 2ac21a77ec..6606fc23b8 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java @@ -161,6 +161,7 @@ public final class BazelAnalysisMock extends AnalysisMock { .add("sh_binary(name = 'aar_generator', srcs = ['empty.sh'])") .add("sh_binary(name = 'dexbuilder', srcs = ['empty.sh'])") .add("sh_binary(name = 'dexmerger', srcs = ['empty.sh'])") + .add("sh_binary(name = 'manifest_merger', srcs = ['empty.sh'])") .add("sh_binary(name = 'resources_processor', srcs = ['empty.sh'])") .add("sh_binary(name = 'resource_shrinker', srcs = ['empty.sh'])") .add("android_library(name = 'incremental_stub_application')") |