summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Brett Chabot <brettchabot@android.com> 2011-06-17 17:03:20 -0700
committer Brett Chabot <brettchabot@android.com> 2011-06-17 17:03:20 -0700
commit01f0fd84d085f90ca73e9091618ab3d98b5e1c4a (patch)
treec87cda4143344bc8aa8dd7efab63432c9910611c
parent576715c75987b64eff120f8800862815753b0c8a (diff)
Include testdata in layoutlib-tests.
Change-Id: I79fff895a13d171079b59db54d4b9d2bec555b3c
-rw-r--r--tools/layoutlib/bridge/tests/Android.mk2
-rw-r--r--tools/layoutlib/bridge/tests/res/com/android/layoutlib/testdata/layout1.xml (renamed from tools/layoutlib/bridge/tests/src/com/android/layoutlib/testdata/layout1.xml)0
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/tests/Android.mk b/tools/layoutlib/bridge/tests/Android.mk
index e303638ae821..98cade9f681d 100644
--- a/tools/layoutlib/bridge/tests/Android.mk
+++ b/tools/layoutlib/bridge/tests/Android.mk
@@ -19,6 +19,8 @@ include $(CLEAR_VARS)
# Only compile source java files in this lib.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_JAVA_RESOURCE_DIRS := res
+
LOCAL_MODULE := layoutlib-tests
LOCAL_MODULE_TAGS := optional
diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/testdata/layout1.xml b/tools/layoutlib/bridge/tests/res/com/android/layoutlib/testdata/layout1.xml
index b8fc9472ed83..b8fc9472ed83 100644
--- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/testdata/layout1.xml
+++ b/tools/layoutlib/bridge/tests/res/com/android/layoutlib/testdata/layout1.xml