mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: get rule sharing right; it seems we have to nest imports

Browse Source
This commit is contained in:
Michael Meeks
2012-08-03 11:58:19 +01:00
parent 92236c0fc4
commit 42c1644f8b
5 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/Bootstrap/no-resource-compress.xml
View File

@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project name="android_rules" default="debug"> <project name="clobber_android_rules" default="debug">
<import file="${sdk.dir}/tools/ant/build.xml" />
<!-- <!--
This is copy/pasted from ${sdk.dir}/tools/ant/build.xml This is copy/pasted from ${sdk.dir}/tools/ant/build.xml

1
android/experimental/LibreOffice4Android/build.xml
View File

@@ -80,6 +80,5 @@
in order to avoid having your file be overridden by tools such as "android update project" in order to avoid having your file be overridden by tools such as "android update project"
--> -->
<!-- version-tag: 1 --> <!-- version-tag: 1 -->
<import file="${sdk.dir}/tools/ant/build.xml" />
<import file="${android.library.reference.1}/no-resource-compress.xml" /> <import file="${android.library.reference.1}/no-resource-compress.xml" />
</project> </project>

1
android/qa/desktop/build.xml
View File

@@ -80,6 +80,5 @@
in order to avoid having your file be overridden by tools such as "android update project" in order to avoid having your file be overridden by tools such as "android update project"
--> -->
<!-- version-tag: 1 --> <!-- version-tag: 1 -->
<import file="${sdk.dir}/tools/ant/build.xml" />
<import file="${android.library.reference.1}/no-resource-compress.xml" /> <import file="${android.library.reference.1}/no-resource-compress.xml" />
</project> </project>

1
android/qa/sc/build.xml
View File

@@ -80,6 +80,5 @@
in order to avoid having your file be overridden by tools such as "android update project" in order to avoid having your file be overridden by tools such as "android update project"
--> -->
<!-- version-tag: 1 --> <!-- version-tag: 1 -->
<import file="${sdk.dir}/tools/ant/build.xml" />
<import file="${android.library.reference.1}/no-resource-compress.xml" /> <import file="${android.library.reference.1}/no-resource-compress.xml" />
</project> </project>

1
android/qa/simple/build.xml
View File

@@ -80,6 +80,5 @@
in order to avoid having your file be overridden by tools such as "android update project" in order to avoid having your file be overridden by tools such as "android update project"
--> -->
<!-- version-tag: 1 --> <!-- version-tag: 1 -->
<import file="${sdk.dir}/tools/ant/build.xml" />
<import file="${android.library.reference.1}/no-resource-compress.xml" /> <import file="${android.library.reference.1}/no-resource-compress.xml" />
</project> </project>