[Libreoffice-commits] .: android/Bootstrap android/experimental android/qa

[Michael Meeks]

 android/Bootstrap/no-resource-compress.xml         |    4 +++-
 android/experimental/LibreOffice4Android/build.xml |    1 -
 android/qa/desktop/build.xml                       |    1 -
 android/qa/sc/build.xml                            |    1 -
 android/qa/simple/build.xml                        |    1 -
 5 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 42c1644f8b24d2462d747c07a75283e9cd99b415
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Fri Aug 3 11:58:19 2012 +0100

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

diff --git a/android/Bootstrap/no-resource-compress.xml b/android/Bootstrap/no-resource-compress.xml
index d7d9408..5363c4c 100644
--- a/android/Bootstrap/no-resource-compress.xml
+++ b/android/Bootstrap/no-resource-compress.xml
@@ -1,5 +1,7 @@
 <?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
diff --git a/android/experimental/LibreOffice4Android/build.xml b/android/experimental/LibreOffice4Android/build.xml
index 5ce5b75..d2e79f7 100644
--- a/android/experimental/LibreOffice4Android/build.xml
+++ b/android/experimental/LibreOffice4Android/build.xml
@@ -80,6 +80,5 @@
          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" />
     <import file="${android.library.reference.1}/no-resource-compress.xml" />
 </project>
diff --git a/android/qa/desktop/build.xml b/android/qa/desktop/build.xml
index 8c88493..4aac2f5 100644
--- a/android/qa/desktop/build.xml
+++ b/android/qa/desktop/build.xml
@@ -80,6 +80,5 @@
          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" />
     <import file="${android.library.reference.1}/no-resource-compress.xml" />
 </project>
diff --git a/android/qa/sc/build.xml b/android/qa/sc/build.xml
index 8c88493..4aac2f5 100644
--- a/android/qa/sc/build.xml
+++ b/android/qa/sc/build.xml
@@ -80,6 +80,5 @@
          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" />
     <import file="${android.library.reference.1}/no-resource-compress.xml" />
 </project>
diff --git a/android/qa/simple/build.xml b/android/qa/simple/build.xml
index 1ac6008..5b385be 100644
--- a/android/qa/simple/build.xml
+++ b/android/qa/simple/build.xml
@@ -80,6 +80,5 @@
          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" />
     <import file="${android.library.reference.1}/no-resource-compress.xml" />
 </project>