Commit ddd77245 by Courtney Goeltzenleuchter Committed by Commit Bot

Add GLESv1_CM to angle library apk

Bug: angleproject:2418 Change-Id: I793d330a2cc92a510b189fa23d14f41f48a7d986 Reviewed-on: https://chromium-review.googlesource.com/1035422Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Courtney Goeltzenleuchter <courtneygo@google.com>
parent 0ade8e88
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
android:targetSdkVersion="24"> android:targetSdkVersion="24">
</uses-sdk> </uses-sdk>
<!-- TODO: Remove debuggable property for production? -->
<application android:label="Android System Angle" <application android:label="Android System Angle"
android:extractNativeLibs="false" android:extractNativeLibs="false"
android:multiArch="true" android:multiArch="true"
......
...@@ -917,6 +917,7 @@ if (is_android) { ...@@ -917,6 +917,7 @@ if (is_android) {
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)",
"//third_party/angle:libGLESv1_CM${angle_libs_suffix}($android_secondary_abi_toolchain)",
] ]
} }
...@@ -931,6 +932,7 @@ if (is_android) { ...@@ -931,6 +932,7 @@ if (is_android) {
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}",
"//third_party/angle:libGLESv1_CM${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