diff options
| author | Brett Chabot <brettchabot@android.com> | 2011-06-21 11:27:29 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-21 11:27:29 -0700 |
| commit | 3523325159c083140ba51d36f46270f6adddad77 (patch) | |
| tree | 59e5bd628f656bd4adbc4d96b26cc517fd0c7836 /tools | |
| parent | 31e92e4f19367bd791c1d962a2627f59eab2ab86 (diff) | |
| parent | 01f0fd84d085f90ca73e9091618ab3d98b5e1c4a (diff) | |
| download | frameworks_base-3523325159c083140ba51d36f46270f6adddad77.zip frameworks_base-3523325159c083140ba51d36f46270f6adddad77.tar.gz frameworks_base-3523325159c083140ba51d36f46270f6adddad77.tar.bz2 | |
Merge "Include testdata in layoutlib-tests."
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/tests/Android.mk | 2 | ||||
| -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 e303638..98cade9 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 b8fc947..b8fc947 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 |