diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-08-03 11:58:19 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-08-03 11:58:19 +0100 |
| commit | 42c1644f8b24d2462d747c07a75283e9cd99b415 (patch) | |
| tree | aba6d0ce56421f93e3c63744b22c07824efd2917 /android | |
| parent | 92236c0fc4c8704a72f20a3c2e6f22df3c5ae333 (diff) | |
android: get rule sharing right; it seems we have to nest imports
Diffstat (limited to 'android')
| -rw-r--r-- | android/Bootstrap/no-resource-compress.xml | 4 | ||||
| -rw-r--r-- | android/experimental/LibreOffice4Android/build.xml | 1 | ||||
| -rw-r--r-- | android/qa/desktop/build.xml | 1 | ||||
| -rw-r--r-- | android/qa/sc/build.xml | 1 | ||||
| -rw-r--r-- | android/qa/simple/build.xml | 1 |
5 files changed, 3 insertions, 5 deletions
diff --git a/android/Bootstrap/no-resource-compress.xml b/android/Bootstrap/no-resource-compress.xml index d7d940818672..5363c4c4737c 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 5ce5b75d7c70..d2e79f752136 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 8c88493bc2f3..4aac2f548251 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 8c88493bc2f3..4aac2f548251 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 1ac60081016b..5b385be4e380 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> |