Skip to content

A
angle
Commit fc99468d by Thomas Anderson Committed by Commit Bot
Options

Revert "Fix Android ASAN tests when is_component_build=false"

This reverts commit e4a52cb5. Reason for revert: No longer necessary after https://chromium-review.googlesource.com/c/chromium/src/+/1409558 Original change's description: > Fix Android ASAN tests when is_component_build=false > > Context in Chromium CL: > https://chromium-review.googlesource.com/c/chromium/src/+/1405277/ > > This CL must be landed first. > > BUG=chromium:916973 > R=​thakis,cwallez,fjhenigman,geofflang,jmadill,ynovikov > > Change-Id: Icde4ec98c9031a262e0dfafa5cfe2a702c4c4e3e > Reviewed-on: https://chromium-review.googlesource.com/c/1405908 > Reviewed-by: Yuly Novikov <ynovikov@chromium.org> > Reviewed-by: Nico Weber <thakis@chromium.org> > Reviewed-by: Jamie Madill <jmadill@chromium.org> > Commit-Queue: Yuly Novikov <ynovikov@chromium.org> TBR=thakis@chromium.org,ynovikov@chromium.org,fjhenigman@google.com,geofflang@chromium.org,jmadill@chromium.org,cwallez@google.com,thomasanderson@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: chromium:916973 Change-Id: Ie9609db8e5d5f71acdc22d839b94f3e843bfe3ca Reviewed-on: https://chromium-review.googlesource.com/c/1410282Reviewed-by: 's avatarNico Weber <thakis@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Nico Weber <thakis@chromium.org>
parent 91b95ce0
Showing with 2 additions and 9 deletions
src/tests/BUILD.gn
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
# found in the LICENSE file. # found in the LICENSE file.
import("../../gni/angle.gni") import("../../gni/angle.gni")
import("//build/config/c++/c++.gni")
import("//build/config/chromecast_build.gni") import("//build/config/chromecast_build.gni")
import("//testing/test.gni") import("//testing/test.gni")
import("angle_unittests.gni") import("angle_unittests.gni")
...@@ -289,10 +288,7 @@ if (is_win || is_linux || is_android || is_mac) { ...@@ -289,10 +288,7 @@ if (is_win || is_linux || is_android || is_mac) {
if (is_android) { if (is_android) {
use_native_activity = true use_native_activity = true
if (!export_libcxxabi_from_executables) { configs -= [ "//build/config/android:hide_all_but_jni" ]
# This config is already removed if(export_libcxxabi_from_executables)
configs -= [ "//build/config/android:hide_all_but_jni" ]
}
} }
if (is_win) { if (is_win) {
...@@ -342,10 +338,7 @@ if (is_win || is_linux || is_android || is_mac) { ...@@ -342,10 +338,7 @@ if (is_win || is_linux || is_android || is_mac) {
if (is_android) { if (is_android) {
use_native_activity = true use_native_activity = true
if (!export_libcxxabi_from_executables) { configs -= [ "//build/config/android:hide_all_but_jni" ]
# This config is already removed if(export_libcxxabi_from_executables)
configs -= [ "//build/config/android:hide_all_but_jni" ]
}
} }
configs += [ configs += [
......
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