diff options
| author | Raphael Moll <raphael@google.com> | 2012-01-11 15:08:51 -0800 |
|---|---|---|
| committer | Raphael Moll <raphael@google.com> | 2012-01-12 15:38:07 -0800 |
| commit | 56e76eab1b28d1423bff90ed21362494312c077a (patch) | |
| tree | a65503b3f49bcb35c90f5a2e8ac3afd1b1e132cd /manifmerger | |
| parent | 2f370f84db49e23c4aa35a5949d7cefcb6c20ce4 (diff) | |
| download | sdk-56e76eab1b28d1423bff90ed21362494312c077a.zip sdk-56e76eab1b28d1423bff90ed21362494312c077a.tar.gz sdk-56e76eab1b28d1423bff90ed21362494312c077a.tar.bz2 | |
SDK: Enable tests for manifest-merger.
Change-Id: I48f74d5d3ff5237388915cb3823be5168903d417
Diffstat (limited to 'manifmerger')
| -rw-r--r-- | manifmerger/Android.mk | 2 | ||||
| -rwxr-xr-x | manifmerger/tests/Android.mk | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/manifmerger/Android.mk b/manifmerger/Android.mk index 245744a..ce14ee6 100644 --- a/manifmerger/Android.mk +++ b/manifmerger/Android.mk @@ -3,3 +3,5 @@ MANIFMERGER_LOCAL_DIR := $(call my-dir) include $(MANIFMERGER_LOCAL_DIR)/src/Android.mk include $(MANIFMERGER_LOCAL_DIR)/etc/Android.mk +include $(MANIFMERGER_LOCAL_DIR)/tests/Android.mk + diff --git a/manifmerger/tests/Android.mk b/manifmerger/tests/Android.mk index c1dcea9..9314106 100755 --- a/manifmerger/tests/Android.mk +++ b/manifmerger/tests/Android.mk @@ -23,6 +23,6 @@ LOCAL_JAVA_RESOURCE_DIRS := src LOCAL_MODULE := manifmerger-tests LOCAL_MODULE_TAGS := optional -LOCAL_JAVA_LIBRARIES := manifmerger junit +LOCAL_JAVA_LIBRARIES := manifmerger sdklib-tests junit include $(BUILD_HOST_JAVA_LIBRARY) |