Skip to content

A
angle
Commit e5db628b by Courtney Goeltzenleuchter Committed by Commit Bot
Options

Cleanup for "Add angle library apk"

Forgot to format BUILD.gn in CL 46978bccd3659 Remove unnecessary android:debuggable setting Bug: angleproject:2520 Change-Id: I31457c82536827f78e3aa17c02dd8e878f803f04 Reviewed-on: https://chromium-review.googlesource.com/1030259Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent b221486a
Showing with 15 additions and 13 deletions
AndroidManifest.xml
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
<application android:label="Android System Angle" <application android:label="Android System Angle"
android:extractNativeLibs="false" android:extractNativeLibs="false"
android:multiArch="true" android:multiArch="true"
android:debuggable="true"
android:hasCode="false"> android:hasCode="false">
</application> </application>
</manifest> </manifest>
BUILD.gn
...@@ -430,21 +430,20 @@ if (angle_enable_vulkan) { ...@@ -430,21 +430,20 @@ if (angle_enable_vulkan) {
"$angle_root/third_party/glslang:glslang_config", "$angle_root/third_party/glslang:glslang_config",
"$angle_root/third_party/vulkan-validation-layers:vulkan_config", "$angle_root/third_party/vulkan-validation-layers:vulkan_config",
] ]
data_deps = [ ] data_deps = []
if (!is_android) { if (!is_android) {
deps += [ "$angle_root/third_party/vulkan-validation-layers:libvulkan" ] deps += [ "$angle_root/third_party/vulkan-validation-layers:libvulkan" ]
data_deps += [ "$angle_root/third_party/vulkan-validation-layers:VkICD_mock_icd" ] data_deps +=
public_configs += [ "$angle_root/third_party/vulkan-validation-layers:vulkan_loader_config" ] [ "$angle_root/third_party/vulkan-validation-layers:VkICD_mock_icd" ]
public_configs += [
"$angle_root/third_party/vulkan-validation-layers:vulkan_loader_config",
]
} }
if (angle_enable_vulkan_validation_layers) { if (angle_enable_vulkan_validation_layers) {
data_deps += [ data_deps += [ "$angle_root/third_party/vulkan-validation-layers:vulkan_validation_layers" ]
"$angle_root/third_party/vulkan-validation-layers:vulkan_validation_layers",
]
if (!is_android) { if (!is_android) {
data_deps += [ data_deps += [ "$angle_root/third_party/vulkan-validation-layers:vulkan_gen_json_files" ]
"$angle_root/third_party/vulkan-validation-layers:vulkan_gen_json_files",
]
} }
} }
} }
...@@ -916,18 +915,22 @@ if (is_android) { ...@@ -916,18 +915,22 @@ if (is_android) {
android_apk("angle_apk") { android_apk("angle_apk") {
if (build_apk_secondary_abi && android_64bit_target_cpu) { if (build_apk_secondary_abi && android_64bit_target_cpu) {
secondary_abi_shared_libraries = [ secondary_abi_shared_libraries = [
"//third_party/angle:libGLESv2${angle_libs_suffix}($android_secondary_abi_toolchain)" , "//third_party/angle:libGLESv2${angle_libs_suffix}($android_secondary_abi_toolchain)",
"//third_party/angle:libEGL${angle_libs_suffix}($android_secondary_abi_toolchain)" "//third_party/angle:libEGL${angle_libs_suffix}($android_secondary_abi_toolchain)",
] ]
} }
android_manifest = "AndroidManifest.xml" android_manifest = "AndroidManifest.xml"
# requires_sdk_api_level_23 tells the apk tool that this apk is only
# supported on M or later releases (which is true for Vulkan).
# Allows tool to optimize for that.
requires_sdk_api_level_23 = true requires_sdk_api_level_23 = true
apk_name = "AngleLibraries" apk_name = "AngleLibraries"
uncompress_shared_libraries = true uncompress_shared_libraries = true
shared_libraries = [ shared_libraries = [
"//third_party/angle:libGLESv2${angle_libs_suffix}", "//third_party/angle:libGLESv2${angle_libs_suffix}",
"//third_party/angle:libEGL${angle_libs_suffix}" "//third_party/angle:libEGL${angle_libs_suffix}",
] ]
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment