diff options
| -rw-r--r-- | build.xml | 27 | ||||
| -rw-r--r-- | jack/.classpath | 1 | ||||
| -rw-r--r-- | jack/Android.mk | 1 | ||||
| -rw-r--r-- | simple/Android.mk | 70 | ||||
| -rw-r--r-- | simple/MODULE_LICENSE_APACHE2 | 0 | ||||
| -rw-r--r-- | simple/PREBUILT | 8 | ||||
| -rw-r--r-- | simple/README.android | 6 | ||||
| -rw-r--r-- | simple/simple-common-6.0.1.jar | bin | 0 -> 44262 bytes | |||
| -rw-r--r-- | simple/simple-http-6.0.1.jar | bin | 0 -> 176270 bytes | |||
| -rw-r--r-- | simple/simple-transport-6.0.1.jar | bin | 0 -> 70497 bytes |
10 files changed, 112 insertions, 1 deletions
@@ -40,6 +40,7 @@ args4j-lib-clean, dx-lib-clean, ecj-clean, + simple-lib-clean, freemarker-lib-clean, guava-lib-clean, jsr305-lib-clean, @@ -72,6 +73,7 @@ <property name="ddm-lib.dir" value="${jack-project.dir}/ddmlib"/> <property name="dx.dir" value="${jack-project.dir}/dx"/> <property name="ecj.dir" value="${jack-project.dir}/ecj"/> + <property name="simple.dir" value="${jack-project.dir}/simple"/> <property name="freemarker.dir" value="${jack-project.dir}/freemarker"/> <property name="guava.dir" value="${jack-project.dir}/guava"/> <property name="jsr305.dir" value="${jack-project.dir}/jsr305"/> @@ -107,11 +109,12 @@ <delete dir="${jack.tools.dir}"/> </target> - <target name="jack-copy-libs" depends="ecj,guava-lib,dx-lib,args4j-lib,antlr-rt-lib,jsr305-lib, + <target name="jack-copy-libs" depends="ecj,simple-lib,guava-lib,dx-lib,args4j-lib,antlr-rt-lib,jsr305-lib, junit4,dex-lib,dx-ref-lib,jack-api-lib"> <copy todir="${jack.libs.dir}" flatten="true"> <filelist dir="/" > <file name="${ecj.dist.dir}/${ecj.libname}"/> + <file name="${simple.dist.dir}/${simple.libname}"/> <file name="${guava.dist.dir}/${guava.libname}"/> <file name="${dx.dist.dir}/${dx.libname}"/> <file name="${args4j.dist.dir}/${args4j.libname}"/> @@ -142,6 +145,7 @@ <filelist id="jack.static.libs.fileset" dir="/"> <file name="${jack-api.dist.dir}/${jack-api.lib.name}"/> <file name="${ecj.dist.dir}/${ecj.libname}" /> + <file name="${simple.dist.dir}/${simple.libname}"/> <file name="${guava.dist.dir}/${guava.libname}" /> <file name="${jsr305.dist.dir}/${jsr305.libname}" /> <file name="${dx.dist.dir}/${dx.libname}" /> @@ -773,6 +777,27 @@ <!-- ******************* --> + <!-- simple-lib --> + <!-- ******************* --> + <property name="simple.libname" value="simple-lib.jar"/> + <property name="simple.dist.dir" value="${simple.dir}/dist"/> + <property name="simple.build.outdir" value="${simple.dir}/build/classes"/> + + <target name="simple-lib-clean"> + <delete dir="${simple.dist.dir}"/> + </target> + + <target name="simple-lib"> + <mkdir dir="${simple.dist.dir}"/> + <mkdir dir="${simple.build.outdir}"/> + <unzip dest="${simple.build.outdir}" src="${simple.dir}/simple-common-6.0.1.jar"/> + <unzip dest="${simple.build.outdir}" src="${simple.dir}/simple-http-6.0.1.jar"/> + <unzip dest="${simple.build.outdir}" src="${simple.dir}/simple-transport-6.0.1.jar"/> + <jar basedir="${simple.build.outdir}" destfile="${simple.dist.dir}/${simple.libname}"/> + </target> + + + <!-- ******************* --> <!-- dx-ref-lib --> <!-- ******************* --> <property name="dx-ref.libname" value="dx-ref.jar" /> diff --git a/jack/.classpath b/jack/.classpath index a261de9..11aab9f 100644 --- a/jack/.classpath +++ b/jack/.classpath @@ -21,5 +21,6 @@ <classpathentry kind="lib" path="libs/junit4.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry combineaccessrules="false" kind="src" path="/jack-api"/> + <classpathentry kind="lib" path="libs/simple-lib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/jack/Android.mk b/jack/Android.mk index 882874e..f48e57d 100644 --- a/jack/Android.mk +++ b/jack/Android.mk @@ -90,6 +90,7 @@ LOCAL_JAVACFLAGS := -processor com.android.sched.build.SchedAnnotationProcessor JACK_STATIC_JAVA_LIBRARIES := \ ecj-jack \ + simple-jack \ guava-jack \ jsr305lib-jack \ dx-jack \ diff --git a/simple/Android.mk b/simple/Android.mk new file mode 100644 index 0000000..ef97d84 --- /dev/null +++ b/simple/Android.mk @@ -0,0 +1,70 @@ +# Copyright (C) 2015 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +LOCAL_PATH:= $(call my-dir) + + +# +# simple-jack +# + +include $(CLEAR_VARS) + +LOCAL_MODULE := simple-jack + +LOCAL_STATIC_JAVA_LIBRARIES := \ + simple-common-jack \ + simple-http-jack \ + simple-transport-jack + +include $(BUILD_HOST_JAVA_LIBRARY) + +# +# simple-common-jack +# + +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +LOCAL_PREBUILT_JAVA_LIBRARIES := \ + simple-common-jack:simple-common-6.0.1$(COMMON_JAVA_PACKAGE_SUFFIX) + +include $(BUILD_HOST_PREBUILT) + +# +# simple-http-jack +# + +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +LOCAL_PREBUILT_JAVA_LIBRARIES := \ + simple-http-jack:simple-http-6.0.1$(COMMON_JAVA_PACKAGE_SUFFIX) + +include $(BUILD_HOST_PREBUILT) + +# +# simple-transport-jack +# + +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +LOCAL_PREBUILT_JAVA_LIBRARIES := \ + simple-transport-jack:simple-transport-6.0.1$(COMMON_JAVA_PACKAGE_SUFFIX) + +include $(BUILD_HOST_PREBUILT) diff --git a/simple/MODULE_LICENSE_APACHE2 b/simple/MODULE_LICENSE_APACHE2 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/simple/MODULE_LICENSE_APACHE2 diff --git a/simple/PREBUILT b/simple/PREBUILT new file mode 100644 index 0000000..f69b00b --- /dev/null +++ b/simple/PREBUILT @@ -0,0 +1,8 @@ +The objects in this prebuilt directory can be rebuilt +using the archive + +http://www.simpleframework.org/download/download.php?version=6.0.1&package=simple-6.0.1.tar.gz + +An then doing: +mvn install + diff --git a/simple/README.android b/simple/README.android new file mode 100644 index 0000000..45a2cf8 --- /dev/null +++ b/simple/README.android @@ -0,0 +1,6 @@ +URL: http://www.simpleframework.org/download/download.php?version=6.0.1&package=simple-6.0.1.tar.gz +Tag: 6.0.1 +License: Apache 2 +Description: A small, embeddable HTPP and WebSocket engine. +Local Modifications: None. + diff --git a/simple/simple-common-6.0.1.jar b/simple/simple-common-6.0.1.jar Binary files differnew file mode 100644 index 0000000..edb6319 --- /dev/null +++ b/simple/simple-common-6.0.1.jar diff --git a/simple/simple-http-6.0.1.jar b/simple/simple-http-6.0.1.jar Binary files differnew file mode 100644 index 0000000..c1b1c76 --- /dev/null +++ b/simple/simple-http-6.0.1.jar diff --git a/simple/simple-transport-6.0.1.jar b/simple/simple-transport-6.0.1.jar Binary files differnew file mode 100644 index 0000000..6812525 --- /dev/null +++ b/simple/simple-transport-6.0.1.jar |