AvaloniaUI
/
angle
зеркало из https://github.com/AvaloniaUI/angle.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Android: Enable APK build. 

Bug: angleproject:2344
Change-Id: Iaad7199d2bcbb961d64f14eb640d472c52d7abc6
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2842564
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Cody Northrop <cnorthrop@google.com>
This commit is contained in:
Jamie Madill 2021-04-21 12:12:26 -04:00 коммит произвёл Commit Bot
Родитель 598b6bbd3e
Коммит 002e562277
2 изменённых файлов: 9 добавлений и 30 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
BUILD.gn
Просмотреть файл

@ -1315,8 +1315,7 @@ if (is_android && symbol_level != 0) {
}
}
if (build_with_chromium && is_android &&
current_toolchain == default_toolchain) {
if (is_android && current_toolchain == default_toolchain) {
apk_version_code = "0"
if (angle_enable_commit_id) {
apk_version_code =

36
android/angle_apk.gni
Просмотреть файл

@ -21,7 +21,7 @@ if (enable_java_templates) {
"${target_gen_dir}/${target_name}/android/AndroidManifest.xml"
jinja_template(manifest_target_name) {
input = "//third_party/angle/android/AndroidManifest.xml.jinja2"
input = "${angle_root}/android/AndroidManifest.xml.jinja2"
output = manifest_path
variables = [
"manifest_package=${invoker.package_name}",
@ -42,6 +42,7 @@ if (enable_java_templates) {
version_name = invoker.version_name
min_sdk_version = 26
target_sdk_version = 28
generate_final_jni = false
deps = [ ":${invoker.package_name}_assets" ]
if (symbol_level != 0) {
deps += [ ":compressed_symbols" ]
@ -72,22 +73,11 @@ if (enable_java_templates) {
"root_out_dir")
secondary_abi_loadable_modules = []
foreach(_library, angle_libraries) {
if (is_component_build) {
secondary_abi_loadable_modules += [ "$_secondary_out_dir/lib.compressed/${_library}${angle_libs_suffix}.cr.so" ]
} else {
secondary_abi_loadable_modules += [ "$_secondary_out_dir/lib.compressed/${_library}${angle_libs_suffix}.so" ]
}
secondary_abi_loadable_modules += [ "$_secondary_out_dir/lib.compressed/${_library}${angle_libs_suffix}${shlib_extension}" ]
}
if (angle_enable_vulkan_validation_layers) {
foreach(_layer, vulkan_validation_layers) {
if (is_component_build) {
secondary_abi_loadable_modules += [
"${_secondary_out_dir}/lib.compressed/lib${_layer}.cr.so",
]
} else {
secondary_abi_loadable_modules +=
[ "${_secondary_out_dir}/lib.compressed/lib${_layer}.so" ]
}
secondary_abi_loadable_modules += [ "${_secondary_out_dir}/lib.compressed/lib${_layer}${shlib_extension}" ]
}
}
}
@ -107,23 +97,13 @@ if (enable_java_templates) {
} else {
loadable_modules = []
foreach(_library, angle_libraries) {
if (is_component_build) {
loadable_modules += [ "$root_out_dir/lib.compressed/${_library}${angle_libs_suffix}.cr.so" ]
} else {
loadable_modules += [
"$root_out_dir/lib.compressed/${_library}${angle_libs_suffix}.so",
]
}
loadable_modules += [ "$root_out_dir/lib.compressed/${_library}${angle_libs_suffix}${shlib_extension}" ]
}
if (angle_enable_vulkan_validation_layers) {
foreach(_layer, vulkan_validation_layers) {
if (is_component_build) {
loadable_modules +=
[ "$root_out_dir/lib.compressed/lib${_layer}.cr.so" ]
} else {
loadable_modules +=
[ "$root_out_dir/lib.compressed/lib${_layer}.so" ]
}
loadable_modules += [
"$root_out_dir/lib.compressed/lib${_layer}${shlib_extension}",
]
}
}
}