aboutsummaryrefslogtreecommitdiffstats
path: root/build/tools.atree
diff options
context:
space:
mode:
authorRaphael Moll <raphael@google.com>2012-01-13 13:45:48 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-13 13:45:48 -0800
commit4b8c9bce1527c7f72acfda2dae31703d1eb80dbc (patch)
tree704355a74e62b51e15fe01c9b8cb6994beddaf88 /build/tools.atree
parent40c5eb43fb2337e78cc62ebeef04bd1b52e70f68 (diff)
parent56e76eab1b28d1423bff90ed21362494312c077a (diff)
downloadsdk-4b8c9bce1527c7f72acfda2dae31703d1eb80dbc.zip
sdk-4b8c9bce1527c7f72acfda2dae31703d1eb80dbc.tar.gz
sdk-4b8c9bce1527c7f72acfda2dae31703d1eb80dbc.tar.bz2
Merge "SDK: Enable tests for manifest-merger."
Diffstat (limited to 'build/tools.atree')
-rw-r--r--build/tools.atree17
1 files changed, 10 insertions, 7 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
+