commit 1d46e8abb4a901e6b4ee37958805a9c0b4478bcc
author Colin Cross <ccross@android.com> Tue Jun 12 13:43:10 2018 -0700
committer Colin Cross <ccross@android.com> Thu Jun 14 14:38:54 2018 -0700
tree 5ff09998e628113d7fe15e8e19c94ee474d13a5b
parent e1b4f302e5464c66e9198943ce66905843d73da3

Add LOCAL_DONT_MERGE_MANIFESTS

Some modules have manifests that ManifestMerger doesn't like, and
don't need manifest merging.  Skip manifest merger if
LOCAL_DONT_MERGE_MANIFESTS is set.

Bug: 78447299
Test: m checkbuild
Change-Id: If1a58253c62e0194a6acfd79930b9bb10978abe5

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 1a33153..8cc7c98 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -61,6 +61,7 @@
 LOCAL_DONT_CHECK_MODULE:=
 # Don't delete the META_INF dir when merging static Java libraries.
 LOCAL_DONT_DELETE_JAR_META_INF:=
+LOCAL_DONT_MERGE_MANIFESTS:=
 LOCAL_DPI_FILE_STEM:=
 LOCAL_DPI_VARIANTS:=
 LOCAL_DROIDDOC_ASSET_DIR:=