diff options
| author | Raphael Moll <raphael@google.com> | 2012-01-13 13:45:48 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-13 13:45:48 -0800 |
| commit | 4b8c9bce1527c7f72acfda2dae31703d1eb80dbc (patch) | |
| tree | 704355a74e62b51e15fe01c9b8cb6994beddaf88 | |
| parent | 40c5eb43fb2337e78cc62ebeef04bd1b52e70f68 (diff) | |
| parent | 56e76eab1b28d1423bff90ed21362494312c077a (diff) | |
| download | sdk-4b8c9bce1527c7f72acfda2dae31703d1eb80dbc.zip sdk-4b8c9bce1527c7f72acfda2dae31703d1eb80dbc.tar.gz sdk-4b8c9bce1527c7f72acfda2dae31703d1eb80dbc.tar.bz2 | |
Merge "SDK: Enable tests for manifest-merger."
| -rw-r--r-- | build/tools.atree | 17 | ||||
| -rw-r--r-- | manifmerger/Android.mk | 2 | ||||
| -rwxr-xr-x | manifmerger/tests/Android.mk | 2 |
3 files changed, 13 insertions, 8 deletions
diff --git a/build/tools.atree b/build/tools.atree index d03365f..e730e13 100644 --- a/build/tools.atree +++ b/build/tools.atree @@ -151,10 +151,13 @@ sdk/apps/SdkController tools/apps/SdkController # Tests Component ############################################################################## -sdk/testapps tests/testapps -framework/ddmlib-tests.jar tests/libtests/ddmlib-tests.jar -framework/ninepatch-tests.jar tests/libtests/ninepatch-tests.jar -framework/common-tests.jar tests/libtests/common-tests.jar -framework/sdklib-tests.jar tests/libtests/sdklib-tests.jar -framework/sdkuilib-tests.jar tests/libtests/sdkuilib-tests.jar -framework/layoutlib_api.jar tests/libtests/layoutlib_api.jar +sdk/testapps tests/testapps +framework/ddmlib-tests.jar tests/libtests/ddmlib-tests.jar +framework/ninepatch-tests.jar tests/libtests/ninepatch-tests.jar +framework/common-tests.jar tests/libtests/common-tests.jar +framework/sdklib-tests.jar tests/libtests/sdklib-tests.jar +framework/sdkuilib-tests.jar tests/libtests/sdkuilib-tests.jar +framework/layoutlib_api.jar tests/libtests/layoutlib_api.jar +framework/manifmerger.jar tests/libtests/manifmerger.jar +framework/manifmerger-tests.jar tests/libtests/manifmerger-tests.jar + 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) |