commit 1047e98e4081bd874488a99b3e5d6975e38626f8
author Sam Berlin <sameb@google.com> Sat Dec 07 13:23:58 2013 -0500
committer Sam Berlin <sameb@google.com> Sat Dec 07 13:23:58 2013 -0500
tree f16b831bf247d62273e23a946c91ed86ab84061d
parent e8120035bb4b7472bf855ad33e8fda38c94fbbbc

Fix no_aop build (make it easier to replace the cglib tokens in the ant build files).

build.xml

diff --git a/build.xml b/build.xml
index d4a2558..148b3e7 100644
--- a/build.xml
+++ b/build.xml
@@ -256,10 +256,7 @@
       <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.1.jar"/>]]></replacetoken>
     </replace>
     <replace file="build/no_aop/common.xml" value="">
-      <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.1.jar">
-        <include name="LICENSE"/>
-        <include name="NOTICE"/>
-      </zipfileset>]]></replacetoken>
+      <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.1.jar"><include name="LICENSE"/><include name="NOTICE"/></zipfileset>]]></replacetoken>
     </replace>
     <replace file="build/no_aop/common.xml" value='Bundle-Name" value="$${ant.project.name} (no_aop)'>
       <replacetoken><![CDATA[Bundle-Name" value="${ant.project.name}]]></replacetoken>