fixes for android-8 rebase of dalvik_standalone

detect bootclasspath jar path automatically from dalvik_standalone
This commit is contained in:
Julian Winkler
2023-05-20 12:26:19 +02:00
parent 55098136dc
commit 0baddd9fe8
7 changed files with 34 additions and 25 deletions

View File

@@ -6,6 +6,7 @@ if javac.version() != '1.8.0'
endif
gnome = import('gnome')
fs = import('fs')
incdir_dep = declare_dependency(include_directories: '.')
add_project_dependencies(incdir_dep, language: 'c')
@@ -21,6 +22,15 @@ libart_dep = [
libdl_bio_dep = [
cc.find_library('dl_bio')
]
if fs.is_file('/usr' / get_option('libdir') / 'java/core-all_classes.jar')
bootclasspath = '/usr' / get_option('libdir') / 'java/core-all_classes.jar'
elif fs.is_file('/usr/local' / get_option('libdir') / 'java/core-all_classes.jar')
bootclasspath = '/usr/local' / get_option('libdir') / 'java/core-all_classes.jar'
elif fs.is_file(get_option('prefix') / get_option('libdir') / 'java/core-all_classes.jar')
bootclasspath = get_option('prefix') / get_option('libdir') / 'java/core-all_classes.jar'
else
error('bootclasspath "core-all_classes.jar" not found')
endif
marshal_files = gnome.genmarshal('marshal',
sources: 'src/api-impl-jni/widgets/marshal.list',