115 lines
4.7 KiB
Diff
115 lines
4.7 KiB
Diff
|
commit 707ce843b385d21af5339c5bed0023f26a43a2fa
|
||
|
|
Author: David Black <david8black@gmail.com>
|
||
|
|
Date: Tue Dec 24 19:29:29 2013 +0000
|
||
|
|
|
||
|
|
s
|
||
|
|
|
||
|
|
diff --git a/java/build.xml b/java/build.xml
|
||
|
|
index d51b4ae..8dc27e8 100644
|
||
|
|
--- a/java/build.xml
|
||
|
|
+++ b/java/build.xml
|
||
|
|
@@ -1,10 +1,10 @@
|
||
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
||
|
|
-<project name="java" default="help">
|
||
|
|
+<project name="LatinIME" default="help">
|
||
|
|
|
||
|
|
<!-- The local.properties file is created and updated by the 'android' tool.
|
||
|
|
It contains the path to the SDK. It should *NOT* be checked into
|
||
|
|
Version Control Systems. -->
|
||
|
|
- <property file="local.properties" />
|
||
|
|
+ <loadproperties srcFile="local.properties" />
|
||
|
|
|
||
|
|
<!-- The ant.properties file can be created by you. It is only edited by the
|
||
|
|
'android' tool to add properties to it.
|
||
|
|
@@ -28,15 +28,6 @@
|
||
|
|
-->
|
||
|
|
<property file="ant.properties" />
|
||
|
|
|
||
|
|
- <!-- if sdk.dir was not set from one of the property file, then
|
||
|
|
- get it from the ANDROID_HOME env var.
|
||
|
|
- This must be done before we load project.properties since
|
||
|
|
- the proguard config can use sdk.dir -->
|
||
|
|
- <property environment="env" />
|
||
|
|
- <condition property="sdk.dir" value="${env.ANDROID_HOME}">
|
||
|
|
- <isset property="env.ANDROID_HOME" />
|
||
|
|
- </condition>
|
||
|
|
-
|
||
|
|
<!-- The project.properties file is created and updated by the 'android'
|
||
|
|
tool, as well as ADT.
|
||
|
|
|
||
|
|
@@ -50,23 +41,60 @@
|
||
|
|
|
||
|
|
<!-- quick check on sdk.dir -->
|
||
|
|
<fail
|
||
|
|
- message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
|
||
|
|
+ message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
|
||
|
|
unless="sdk.dir"
|
||
|
|
/>
|
||
|
|
|
||
|
|
- <!--
|
||
|
|
- Import per project custom build rules if present at the root of the project.
|
||
|
|
- This is the place to put custom intermediary targets such as:
|
||
|
|
- -pre-build
|
||
|
|
- -pre-compile
|
||
|
|
- -post-compile (This is typically used for code obfuscation.
|
||
|
|
- Compiled code location: ${out.classes.absolute.dir}
|
||
|
|
- If this is not done in place, override ${out.dex.input.absolute.dir})
|
||
|
|
- -post-package
|
||
|
|
- -post-build
|
||
|
|
- -pre-clean
|
||
|
|
- -->
|
||
|
|
- <import file="custom_rules.xml" optional="true" />
|
||
|
|
+
|
||
|
|
+<!-- extension targets. Uncomment the ones where you want to do custom work
|
||
|
|
+ in between standard targets -->
|
||
|
|
+<!--
|
||
|
|
+ <target name="-pre-build">
|
||
|
|
+ </target>
|
||
|
|
+ <target name="-pre-compile">
|
||
|
|
+ </target>
|
||
|
|
+
|
||
|
|
+ /* This is typically used for code obfuscation.
|
||
|
|
+ Compiled code location: ${out.classes.absolute.dir}
|
||
|
|
+ If this is not done in place, override ${out.dex.input.absolute.dir} */
|
||
|
|
+ <target name="-post-compile">
|
||
|
|
+ </target>
|
||
|
|
+-->
|
||
|
|
+
|
||
|
|
+ <!-- Puts the project's resources into the output package file
|
||
|
|
+ This actually can create multiple resource package in case
|
||
|
|
+ Some custom apk with specific configuration have been
|
||
|
|
+ declared in default.properties.
|
||
|
|
+ -->
|
||
|
|
+ <target name="-package-resources" depends="-crunch">
|
||
|
|
+ <!-- only package resources if *not* a library project -->
|
||
|
|
+ <do-only-if-not-library elseText="Library project: do not package resources..." >
|
||
|
|
+ <aapt executable="${aapt}"
|
||
|
|
+ command="package"
|
||
|
|
+ versioncode="${version.code}"
|
||
|
|
+ versionname="${version.name}"
|
||
|
|
+ debug="${build.is.packaging.debug}"
|
||
|
|
+ manifest="${out.manifest.abs.file}"
|
||
|
|
+ assets="${asset.absolute.dir}"
|
||
|
|
+ androidjar="${project.target.android.jar}"
|
||
|
|
+ apkfolder="${out.absolute.dir}"
|
||
|
|
+ nocrunch="${build.packaging.nocrunch}"
|
||
|
|
+ resourcefilename="${resource.package.file.name}"
|
||
|
|
+ resourcefilter="${aapt.resource.filter}"
|
||
|
|
+ libraryResFolderPathRefid="project.library.res.folder.path"
|
||
|
|
+ libraryPackagesRefid="project.library.packages"
|
||
|
|
+ previousBuildType="${build.last.target}"
|
||
|
|
+ buildType="${build.target}"
|
||
|
|
+ libraryRFileRefid="project.library.bin.r.file.path"
|
||
|
|
+ manifestpackage="${package.name}"
|
||
|
|
+ ignoreAssets="${aapt.ignore.assets}">
|
||
|
|
+ <res path="${out.res.absolute.dir}" />
|
||
|
|
+ <res path="${resource.absolute.dir}" />
|
||
|
|
+ <!-- <nocompress /> forces no compression on any files in assets or res/raw -->
|
||
|
|
+ <nocompress extension="dict" />
|
||
|
|
+ </aapt>
|
||
|
|
+ </do-only-if-not-library>
|
||
|
|
+ </target>
|
||
|
|
|
||
|
|
<!-- Import the actual build file.
|
||
|
|
|