commit 96101f6bb2604c76bfad0ae9506e7629cde7b716
author Tingting Wang <tingtingw@google.com> Thu Nov 05 15:15:08 2015 -0800
committer Tingting Wang <tingtingw@google.com> Fri Nov 06 14:31:13 2015 -0800
tree 39445c5d0b67ceeecd8abec00adfc81699398e0e
parent 67c80a0370571faf24a5e9d1b890b98d8585b78c

Add LicenseActivity to manifest xml file in Contacts/.

BUG 25358009

Change-Id: Ide58c510438620f5267a31e79af2748e3b3b548b

Android.mk

diff --git a/Android.mk b/Android.mk
index 7d18e7d..0679ac1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,10 +14,12 @@
 
 src_dirs := src $(contacts_common_dir)/src $(phone_common_dir)/src
 res_dirs := res $(contacts_common_dir)/res $(phone_common_dir)/res
+asset_dirs := $(contacts_common_dir)/assets
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \
     $(support_library_root_dir)/v7/cardview/res
+LOCAL_ASSET_DIR := $(addprefix $(LOCAL_PATH)/, $(asset_dirs))
 
 LOCAL_AAPT_FLAGS := \
     --auto-add-overlay \