Commit 2565d48b by Courtney Goeltzenleuchter Committed by Commit Bot

Add angle library apk

Package up libraries into Android APK. Libraries must be uncompressed for them to be mmapped properly. Bug: angleproject:2418 Change-Id: I27817d7a6c5dcd93ca7790c55042c6548f84906f Reviewed-on: https://chromium-review.googlesource.com/1013057 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org>
parent f2807385
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2018 The Chromium Authors. All rights reserved. Use of this
source code is governed by a BSD-style license that can be found in the
LICENSE file.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.android.angle">
<uses-sdk android:minSdkVersion="24"
android:targetSdkVersion="24">
</uses-sdk>
<!-- TODO: Remove debuggable property for production? -->
<application android:label="Android System Angle"
android:extractNativeLibs="false"
android:multiArch="true"
android:debuggable="true"
android:hasCode="false">
</application>
</manifest>
...@@ -8,6 +8,10 @@ import("//build/config/linux/pkg_config.gni") ...@@ -8,6 +8,10 @@ import("//build/config/linux/pkg_config.gni")
import("//build/config/ui.gni") import("//build/config/ui.gni")
import("//testing/libfuzzer/fuzzer_test.gni") import("//testing/libfuzzer/fuzzer_test.gni")
import("gni/angle.gni") import("gni/angle.gni")
if (is_android) {
# android/rules.gni can only be imported for Android targets
import("//build/config/android/rules.gni")
}
declare_args() { declare_args() {
# Use the PCI lib to collect GPU information on Linux. # Use the PCI lib to collect GPU information on Linux.
...@@ -906,3 +910,24 @@ executable("angle_shader_translator") { ...@@ -906,3 +910,24 @@ executable("angle_shader_translator") {
"//build/config:exe_and_shlib_deps", "//build/config:exe_and_shlib_deps",
] ]
} }
if (is_android) {
# Package ANGLE libraries for pre-installed system image
android_apk("angle_apk") {
if (build_apk_secondary_abi && android_64bit_target_cpu) {
secondary_abi_shared_libraries = [
"//third_party/angle:libGLESv2${angle_libs_suffix}($android_secondary_abi_toolchain)" ,
"//third_party/angle:libEGL${angle_libs_suffix}($android_secondary_abi_toolchain)"
]
}
android_manifest = "AndroidManifest.xml"
requires_sdk_api_level_23 = true
apk_name = "AngleLibraries"
uncompress_shared_libraries = true
shared_libraries = [
"//third_party/angle:libGLESv2${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