| commit | 3523325159c083140ba51d36f46270f6adddad77 | [log] [tgz] |
|---|---|---|
| author | Brett Chabot <brettchabot@android.com> | Tue Jun 21 11:27:29 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 21 11:27:29 2011 -0700 |
| tree | 59e5bd628f656bd4adbc4d96b26cc517fd0c7836 | |
| parent | 31e92e4f19367bd791c1d962a2627f59eab2ab86 [diff] | |
| parent | 01f0fd84d085f90ca73e9091618ab3d98b5e1c4a [diff] |
Merge "Include testdata in layoutlib-tests."
diff --git a/tools/layoutlib/bridge/tests/Android.mk b/tools/layoutlib/bridge/tests/Android.mk index e303638..98cade9 100644 --- a/tools/layoutlib/bridge/tests/Android.mk +++ b/tools/layoutlib/bridge/tests/Android.mk
@@ -19,6 +19,8 @@ # 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 similarity index 100% rename from tools/layoutlib/bridge/tests/src/com/android/layoutlib/testdata/layout1.xml rename to tools/layoutlib/bridge/tests/res/com/android/layoutlib/testdata/layout1.xml