cleanup leftovers from metadata removals
This commit is contained in:
Izzy
parent
a0dab7730c
commit
378af3d7fd
|
|
@ -1,104 +0,0 @@
|
||||||
diff --git a/build.xml b/build.xml
|
|
||||||
index 5a8eefa..a7f41d8 100644
|
|
||||||
--- a/build.xml
|
|
||||||
+++ b/build.xml
|
|
||||||
@@ -1,10 +1,10 @@
|
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
-<project name="com.android.camera2" default="help">
|
|
||||||
+<project name="Camera2" 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,56 @@
|
|
||||||
|
|
||||||
<!-- 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}"
|
|
||||||
+ 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"
|
|
||||||
+ ignoreAssets="${aapt.ignore.assets}">
|
|
||||||
+ <res path="${out.res.absolute.dir}" />
|
|
||||||
+ <res path="${resource.absolute.dir}" />
|
|
||||||
+ </aapt>
|
|
||||||
+ </do-only-if-not-library>
|
|
||||||
+ </target>
|
|
||||||
|
|
||||||
<!-- Import the actual build file.
|
|
||||||
|
|
||||||
|
|
@ -1,114 +0,0 @@
|
||||||
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.
|
|
||||||
|
|
||||||
|
|
@ -1,126 +0,0 @@
|
||||||
diff --git a/java/custom_rules.xml b/java/custom_rules.xml
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..25fc1eb
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/java/custom_rules.xml
|
|
||||||
@@ -0,0 +1,120 @@
|
|
||||||
+<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
+<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. -->
|
|
||||||
+ <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.
|
|
||||||
+ This is the place to change some Ant specific build properties.
|
|
||||||
+ Here are some properties you may want to change/update:
|
|
||||||
+
|
|
||||||
+ source.dir
|
|
||||||
+ The name of the source directory. Default is 'src'.
|
|
||||||
+ out.dir
|
|
||||||
+ The name of the output directory. Default is 'bin'.
|
|
||||||
+
|
|
||||||
+ For other overridable properties, look at the beginning of the rules
|
|
||||||
+ files in the SDK, at tools/ant/build.xml
|
|
||||||
+
|
|
||||||
+ Properties related to the SDK location or the project target should
|
|
||||||
+ be updated using the 'android' tool with the 'update' action.
|
|
||||||
+
|
|
||||||
+ This file is an integral part of the build system for your
|
|
||||||
+ application and should be checked into Version Control Systems.
|
|
||||||
+
|
|
||||||
+ -->
|
|
||||||
+ <property file="ant.properties" />
|
|
||||||
+
|
|
||||||
+ <!-- The project.properties file is created and updated by the 'android'
|
|
||||||
+ tool, as well as ADT.
|
|
||||||
+
|
|
||||||
+ This contains project specific properties such as project target, and library
|
|
||||||
+ dependencies. Lower level build properties are stored in ant.properties
|
|
||||||
+ (or in .classpath for Eclipse projects).
|
|
||||||
+
|
|
||||||
+ This file is an integral part of the build system for your
|
|
||||||
+ application and should be checked into Version Control Systems. -->
|
|
||||||
+ <loadproperties srcFile="project.properties" />
|
|
||||||
+
|
|
||||||
+ <!-- quick check on sdk.dir -->
|
|
||||||
+ <fail
|
|
||||||
+ message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
|
|
||||||
+ unless="sdk.dir"
|
|
||||||
+ />
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+<!-- 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.
|
|
||||||
+
|
|
||||||
+ To customize existing targets, there are two options:
|
|
||||||
+ - Customize only one target:
|
|
||||||
+ - copy/paste the target into this file, *before* the
|
|
||||||
+ <import> task.
|
|
||||||
+ - customize it to your needs.
|
|
||||||
+ - Customize the whole content of build.xml
|
|
||||||
+ - copy/paste the content of the rules files (minus the top node)
|
|
||||||
+ into this file, replacing the <import> task.
|
|
||||||
+ - customize to your needs.
|
|
||||||
+
|
|
||||||
+ ***********************
|
|
||||||
+ ****** IMPORTANT ******
|
|
||||||
+ ***********************
|
|
||||||
+ In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
|
|
||||||
+ in order to avoid having your file be overridden by tools such as "android update project"
|
|
||||||
+ -->
|
|
||||||
+ <!-- version-tag: 1 -->
|
|
||||||
+ <import file="${sdk.dir}/tools/ant/build.xml" />
|
|
||||||
+
|
|
||||||
+</project>
|
|
||||||
Loading…
Reference in a new issue