From e1a4a812971f604d51bdf098b6117d9ba03da1c8 Mon Sep 17 00:00:00 2001 From: Andrew Pellegrini Date: Wed, 22 Jun 2016 20:46:21 +0000 Subject: 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 --- .../com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 1 + 1 file changed, 1 insertion(+) (limited to 'src/test/java/com/google/devtools') 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')") -- cgit v1.2.3