android: share the clobbering of ant rules to not compress resources
Change-Id: Id2aa869f05b09dc22676d63390ec10bf575571ef
This commit is contained in:
Michael Meeks
parent
b18e6c7d2c
commit
ab852cc0b6
37
android/Bootstrap/no-resource-compress.xml
Normal file
37
android/Bootstrap/no-resource-compress.xml
Normal file
@ -0,0 +1,37 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project name="android_rules" default="debug">
|
||||
|
||||
<!--
|
||||
This is copy/pasted from ${sdk.dir}/tools/ant/build.xml
|
||||
and tweaked - it needs to match the same SDK version as
|
||||
your build
|
||||
-->
|
||||
|
||||
<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}"
|
||||
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="xml" /> forces no compression on specific file extensions in assets and res/raw -->
|
||||
</aapt>
|
||||
</do-only-if-not-library>
|
||||
</target>
|
||||
</project>
|
||||
@ -81,35 +81,5 @@
|
||||
-->
|
||||
<!-- version-tag: custom -->
|
||||
<import file="${sdk.dir}/tools/ant/build.xml" />
|
||||
|
||||
<!-- Re-define the "-package-resources" target to not compress resources -->
|
||||
|
||||
<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}"
|
||||
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="xml" /> forces no compression on specific file extensions in assets and res/raw -->
|
||||
</aapt>
|
||||
</do-only-if-not-library>
|
||||
</target>
|
||||
|
||||
<import file="${android.library.reference.1}/no-resource-compress.xml" />
|
||||
</project>
|
||||
|
||||
@ -81,35 +81,5 @@
|
||||
-->
|
||||
<!-- version-tag: 1 -->
|
||||
<import file="${sdk.dir}/tools/ant/build.xml" />
|
||||
|
||||
<!-- Re-define the "-package-resources" target to not compress resources -->
|
||||
|
||||
<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}"
|
||||
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="xml" /> forces no compression on specific file extensions in assets and res/raw -->
|
||||
</aapt>
|
||||
</do-only-if-not-library>
|
||||
</target>
|
||||
|
||||
<import file="${android.library.reference.1}/no-resource-compress.xml" />
|
||||
</project>
|
||||
|
||||
@ -14,8 +14,13 @@ BOOTSTRAP=org.libreoffice.android.Bootstrap
|
||||
|
||||
APP_DATA_PATH=/data/data/$(APP_PACKAGE)
|
||||
|
||||
SODEST=libs/armeabi-v7a
|
||||
OBJLOCAL=obj/local/armeabi-v7a
|
||||
ifeq ($(CPU),I)
|
||||
ABI_PATH=x86
|
||||
else
|
||||
ABI_PATH=armeabi-v7a
|
||||
endif
|
||||
SODEST=libs/$(ABI_PATH)
|
||||
OBJLOCAL=obj/local/$(ABI_PATH)
|
||||
|
||||
define COPY
|
||||
cp $(1) $(SODEST)$(if $(2),/$(2)) && $(STRIP) --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir $(1))) && \
|
||||
@ -134,6 +139,7 @@ copy-stuff: buildrcs
|
||||
icuuclo \
|
||||
jvmaccessgcc3 \
|
||||
jvmfwk \
|
||||
libotouchlo \
|
||||
lnglo \
|
||||
introspection.uno \
|
||||
lnthlo \
|
||||
@ -192,7 +198,7 @@ copy-stuff: buildrcs
|
||||
|
||||
#
|
||||
# Then the shared GNU C++ library
|
||||
$(call COPY,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
|
||||
$(call COPY,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/$(ABI_PATH)/libgnustl_shared.so)
|
||||
#
|
||||
# Then other "assets" that can be left in the .apk. Let the directory
|
||||
# structure under assets mimic the install set - except for the fact
|
||||
@ -233,7 +239,7 @@ copy-stuff: buildrcs
|
||||
# Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
|
||||
#
|
||||
cp $(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver $(SODEST)
|
||||
echo set solib-search-path ./obj/local/armeabi-v7a >$(SODEST)/gdb.setup
|
||||
echo set solib-search-path ./obj/local/$(ABI_PATH) >$(SODEST)/gdb.setup
|
||||
|
||||
|
||||
build-ant: copy-stuff properties
|
||||
|
||||
@ -81,34 +81,5 @@
|
||||
-->
|
||||
<!-- version-tag: 1 -->
|
||||
<import file="${sdk.dir}/tools/ant/build.xml" />
|
||||
|
||||
<!-- Re-define the "-package-resources" target to not compress resources -->
|
||||
|
||||
<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="AndroidManifest.xml"
|
||||
assets="${asset.absolute.dir}"
|
||||
androidjar="${android.jar}"
|
||||
apkfolder="${out.absolute.dir}"
|
||||
nocrunch="${build.packaging.nocrunch}"
|
||||
resourcefilename="${resource.package.file.name}"
|
||||
resourcefilter="${aapt.resource.filter}"
|
||||
projectLibrariesResName="project.libraries.res"
|
||||
projectLibrariesPackageName="project.libraries.package"
|
||||
previousBuildType="${build.last.target}"
|
||||
buildType="${build.target}">
|
||||
<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="xml" /> forces no compression on specific file extensions in assets and res/raw -->
|
||||
</aapt>
|
||||
</do-only-if-not-library>
|
||||
</target>
|
||||
|
||||
<import file="${android.library.reference.1}/no-resource-compress.xml" />
|
||||
</project>
|
||||
|
||||
@ -81,34 +81,5 @@
|
||||
-->
|
||||
<!-- version-tag: 1 -->
|
||||
<import file="${sdk.dir}/tools/ant/build.xml" />
|
||||
|
||||
<!-- Re-define the "-package-resources" target to not compress resources -->
|
||||
|
||||
<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="AndroidManifest.xml"
|
||||
assets="${asset.absolute.dir}"
|
||||
androidjar="${android.jar}"
|
||||
apkfolder="${out.absolute.dir}"
|
||||
nocrunch="${build.packaging.nocrunch}"
|
||||
resourcefilename="${resource.package.file.name}"
|
||||
resourcefilter="${aapt.resource.filter}"
|
||||
projectLibrariesResName="project.libraries.res"
|
||||
projectLibrariesPackageName="project.libraries.package"
|
||||
previousBuildType="${build.last.target}"
|
||||
buildType="${build.target}">
|
||||
<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="xml" /> forces no compression on specific file extensions in assets and res/raw -->
|
||||
</aapt>
|
||||
</do-only-if-not-library>
|
||||
</target>
|
||||
|
||||
<import file="${android.library.reference.1}/no-resource-compress.xml" />
|
||||
</project>
|
||||
|
||||
@ -81,34 +81,5 @@
|
||||
-->
|
||||
<!-- version-tag: 1 -->
|
||||
<import file="${sdk.dir}/tools/ant/build.xml" />
|
||||
|
||||
<!-- Re-define the "-package-resources" target to not compress resources -->
|
||||
|
||||
<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="AndroidManifest.xml"
|
||||
assets="${asset.absolute.dir}"
|
||||
androidjar="${android.jar}"
|
||||
apkfolder="${out.absolute.dir}"
|
||||
nocrunch="${build.packaging.nocrunch}"
|
||||
resourcefilename="${resource.package.file.name}"
|
||||
resourcefilter="${aapt.resource.filter}"
|
||||
projectLibrariesResName="project.libraries.res"
|
||||
projectLibrariesPackageName="project.libraries.package"
|
||||
previousBuildType="${build.last.target}"
|
||||
buildType="${build.target}">
|
||||
<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="xml" /> forces no compression on specific file extensions in assets and res/raw -->
|
||||
</aapt>
|
||||
</do-only-if-not-library>
|
||||
</target>
|
||||
|
||||
<import file="${android.library.reference.1}/no-resource-compress.xml" />
|
||||
</project>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user