Use ICU data as external archive on android platform.
On android platform, we load the ICU data as external data, not embeded in the kiwix-lib. So we need to generate correctly the dat file and use it in kiwix-android.
This commit is contained in:
parent
fbb84e9d27
commit
cfa7f0cb42
|
@ -190,7 +190,13 @@ class Icu(Dependency):
|
||||||
|
|
||||||
class Builder(MakeBuilder):
|
class Builder(MakeBuilder):
|
||||||
subsource_dir = "source"
|
subsource_dir = "source"
|
||||||
configure_option = "--disable-samples --disable-tests --disable-extras --disable-dyload"
|
|
||||||
|
@property
|
||||||
|
def configure_option(self):
|
||||||
|
options = "--disable-samples --disable-tests --disable-extras --disable-dyload"
|
||||||
|
if self.buildEnv.platform_info.build == 'android':
|
||||||
|
options += " --with-data-packaging=archive"
|
||||||
|
return options
|
||||||
|
|
||||||
|
|
||||||
class Icu_native(Icu):
|
class Icu_native(Icu):
|
||||||
|
@ -347,6 +353,7 @@ class KiwixAndroid(Dependency):
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
pass
|
pass
|
||||||
shutil.copytree(pj(self.buildEnv.install_dir, 'kiwix-lib'), pj(self.build_path, 'kiwixlib', 'src', 'main'))
|
shutil.copytree(pj(self.buildEnv.install_dir, 'kiwix-lib'), pj(self.build_path, 'kiwixlib', 'src', 'main'))
|
||||||
|
shutil.copy2(pj(self.buildEnv.install_dir, 'share', 'icu', '58.2', 'icudt58l.dat'), pj(self.build_path, 'app', 'src', 'main', 'assets', 'icudt.dat'))
|
||||||
|
|
||||||
|
|
||||||
class KiwixCustomApp(Dependency):
|
class KiwixCustomApp(Dependency):
|
||||||
|
@ -409,6 +416,7 @@ class KiwixCustomApp(Dependency):
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
pass
|
pass
|
||||||
shutil.copytree(pj(self.buildEnv.install_dir, 'kiwix-lib'), pj(self.build_path, 'kiwixlib', 'src', 'main'))
|
shutil.copytree(pj(self.buildEnv.install_dir, 'kiwix-lib'), pj(self.build_path, 'kiwixlib', 'src', 'main'))
|
||||||
|
shutil.copy2(pj(self.buildEnv.install_dir, 'share', 'icu', '58.2', 'icudt58l.dat'), pj(self.build_path, 'app', 'src', 'main', 'assets', 'icudt.dat'))
|
||||||
|
|
||||||
# Generate custom directory
|
# Generate custom directory
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in New Issue