tree d53b64a6f80fb82cfa43d65c9b3f2f73b9084cdf
parent 6105e2415faa0f36ec6ae3399d90e1a173ef7f58
author Andrew Pellegrini <apell@google.com> 1466628381 +0000
committer Lukacs Berki <lberki@google.com> 1466680223 +0000

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