aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphael Moll <raphael@google.com>2012-01-15 11:11:19 -0800
committerRaphael Moll <raphael@google.com>2012-01-15 11:11:19 -0800
commitbe4eccfb1447ddc99f7d3d8e60b9b8222223e742 (patch)
tree2446d20408885e0e42f26b92a1b3b372745dd6aa
parent4b8c9bce1527c7f72acfda2dae31703d1eb80dbc (diff)
downloadsdk-be4eccfb1447ddc99f7d3d8e60b9b8222223e742.zip
sdk-be4eccfb1447ddc99f7d3d8e60b9b8222223e742.tar.gz
sdk-be4eccfb1447ddc99f7d3d8e60b9b8222223e742.tar.bz2
Fix build: disable tests for manifest-merger.
Change-Id: Ia36cbcc9b1a8d8ac29a54d610310b1d3e7b63223
-rw-r--r--build/tools.atree5
1 files changed, 3 insertions, 2 deletions
diff --git a/build/tools.atree b/build/tools.atree
index e730e13..92985bb 100644
--- a/build/tools.atree
+++ b/build/tools.atree
@@ -158,6 +158,7 @@ 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
+#FIXME breaks build, manifmerger jar files not properly built
+#framework/manifmerger.jar tests/libtests/manifmerger.jar
+#framework/manifmerger-tests.jar tests/libtests/manifmerger-tests.jar