commit 04b84e42d5bf6af72eade2781cd6ca8e3dc855c2
author Arthur Wang <wuwang@google.com> Fri Oct 07 16:38:52 2016 -0700
committer Arthur Wang <wuwang@google.com> Sat Oct 08 09:12:03 2016 -0700
tree 909c8c1f258d2a70fe5bd3142b5030a7e51466ac
parent cc5899738c6ef6ddf5d64333ca24fd3fff2fc045

Split AndroidManifest.xml into two pieces.

Move the common pieces into common_manifest/AndroidManifest.xml

bug:30900287
Change-Id: I21a80fd2d9302dcaba497e04e0f83421e1be194e

Android.mk

diff --git a/Android.mk b/Android.mk
index 2ed0e69..a03d671 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,6 +23,9 @@
     $(support_library_root_dir)/v7/recyclerview/res
 LOCAL_ASSET_DIR := $(addprefix $(LOCAL_PATH)/, $(asset_dirs))
 
+LOCAL_FULL_MANIFEST_FILE := $(LOCAL_PATH)/AndroidManifest.xml
+LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest_common.xml
+
 LOCAL_AAPT_FLAGS := \
     --auto-add-overlay \
     --extra-packages com.android.contacts.common \