fix another merge issue
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6af0a47d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6af0a47d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6af0a47d Branch: refs/heads/develop Commit: 6af0a47d04353cc4f429820e2e10a61b0ff67dd9 Parents: 31e3c55 Author: Alex Harui <[email protected]> Authored: Fri Apr 21 09:56:10 2017 -0700 Committer: Alex Harui <[email protected]> Committed: Fri Apr 21 09:56:10 2017 -0700 ---------------------------------------------------------------------- examples/native/ButtonExample/build.xml | 34 ---------------------------- 1 file changed, 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6af0a47d/examples/native/ButtonExample/build.xml ---------------------------------------------------------------------- diff --git a/examples/native/ButtonExample/build.xml b/examples/native/ButtonExample/build.xml index a427dd8..5e0f408 100644 --- a/examples/native/ButtonExample/build.xml +++ b/examples/native/ButtonExample/build.xml @@ -33,41 +33,7 @@ <property name="config_arg" value="js" /> <property name="file_suffix" value="as" /> -<<<<<<< HEAD <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}"> -======= - <target name="build"> - <java jar="${FALCONJX_HOME}/lib/mxmlc.jar" resultProperty="errorCode" - fork="true"> - <jvmarg line="${mxmlc.jvm.args}"/> - <jvmarg line="-Dflexlib=${FLEXJS_HOME}/frameworks}"/> - <arg value="+flexlib=${FLEXJS_HOME}/frameworks" /> - <arg value="-debug" /> - <arg value="-define=CONFIG::as_only,false" /> - <arg value="-define=CONFIG::js_only,true" /> - <arg value="-external-library-path=${JS.SWC}" /> - <arg value="-compiler.mxml.children-as-data" /> - <arg value="-compiler.binding-value-change-event=org.apache.flex.events.ValueChangeEvent" /> - <arg value="-compiler.binding-value-change-event-kind=org.apache.flex.events.ValueChangeEvent" /> - <arg value="-compiler.binding-value-change-event-type=valueChange" /> - <arg value="+playerglobal.version=${playerglobal.version}" /> - <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> - <arg value="-js-output-type=FLEXJS" /> - <arg value="-closure-lib=${GOOG_HOME}" /> - <arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" /> - <arg value="${basedir}/src/main/flex/${example}.as" /> - </java> - <fail> - <condition> - <not> - <or> - <equals arg1="${errorCode}" arg2="0" /> - <equals arg1="${errorCode}" arg2="2" /> - </or> - </not> - </condition> - </fail> ->>>>>>> develop </target> <target name="clean">
