Commit 949e0700 by Andrew Grieve Committed by Commit Bot

Update BUILD.gn to account for Android default linker script change

BUG=681557 Change-Id: I8fb4e50d241e3519b27d57a507d92cc3c15877ef Reviewed-on: https://chromium-review.googlesource.com/430877 Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org>
parent 51182ab9
...@@ -432,6 +432,10 @@ config("angle_static") { ...@@ -432,6 +432,10 @@ config("angle_static") {
shared_library("libGLESv2") { shared_library("libGLESv2") {
sources = rebase_path(gles_gypi.libglesv2_sources, ".", "src") sources = rebase_path(gles_gypi.libglesv2_sources, ".", "src")
if (is_android) {
configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
}
if (is_win) { if (is_win) {
ldflags = ldflags =
[ "/DEF:" + rebase_path("src/libGLESv2/libGLESv2.def", root_build_dir) ] [ "/DEF:" + rebase_path("src/libGLESv2/libGLESv2.def", root_build_dir) ]
...@@ -486,6 +490,9 @@ static_library("libGLESv2_static") { ...@@ -486,6 +490,9 @@ static_library("libGLESv2_static") {
shared_library("libEGL") { shared_library("libEGL") {
sources = rebase_path(gles_gypi.libegl_sources, ".", "src") sources = rebase_path(gles_gypi.libegl_sources, ".", "src")
if (is_android) {
configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
}
configs -= angle_undefine_configs configs -= angle_undefine_configs
configs += [ configs += [
":commit_id_config", ":commit_id_config",
...@@ -593,6 +600,9 @@ foreach(is_shared_library, ...@@ -593,6 +600,9 @@ foreach(is_shared_library,
} }
if (is_android) { if (is_android) {
if (is_shared_library) {
configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
}
# To prevent linux sources filtering on android # To prevent linux sources filtering on android
set_sources_assignment_filter([]) set_sources_assignment_filter([])
sources += rebase_path(util_gypi.util_linux_sources, ".", "util") sources += rebase_path(util_gypi.util_linux_sources, ".", "util")
......
...@@ -365,6 +365,9 @@ if (build_angle_deqp_tests) { ...@@ -365,6 +365,9 @@ if (build_angle_deqp_tests) {
] ]
configs -= deqp_undefine_configs configs -= deqp_undefine_configs
if (is_android) {
configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
}
public_configs = [ ":${config_name}" ] public_configs = [ ":${config_name}" ]
sources = rebase_path(target_sources[index], ".", "../..") sources = rebase_path(target_sources[index], ".", "../..")
......
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