commit 13a9c33a5fbdc43b7751876e6a2ba9fa830b98ec
author Walter Jang <wjang@google.com> Sat Aug 13 08:35:14 2016 -0700
committer Walter Jang <wjang@google.com> Sun Aug 14 19:34:49 2016 -0700
tree 4a8c7553151899ac0dd3a2942c3fa922b3c4b79d
parent de8dafeb779741864b4fa4b9eace3c9680cd45b3

Merge res-common resources with exising file in res

For each file, the res-common values are appended to the
the end of the file in res with the same name

Bug 30759296

Change-Id: Icda411d2a9f8acedc51a982be0f4c8c8b7f7c69f

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index f018d3e..48a00f4 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -7,11 +7,8 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
-src_dirs := src
-res_dirs := res res-common
-
-LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, res)
 
 LOCAL_PACKAGE_NAME := ContactsTests