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/1405908Reviewed-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>

Fix Android ASAN tests when is_component_build=false
e4a52cb5 · Tom Anderson · Commit Bot · a3b2e71f · e4a52cb5
Commit e4a52cb5 authored Jan 10, 2019 by Tom Anderson Committed by Commit Bot Jan 10, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

BUILD.gn src/tests/BUILD.gn +9 -2

No files found.
--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 import("../../gni/angle.gni")
+import("//build/config/c++/c++.gni")
 import("//build/config/chromecast_build.gni")
 import("//testing/test.gni")
 import("angle_unittests.gni")
@@ -288,7 +289,10 @@ if (is_win || is_linux || is_android || is_mac) {
    if (is_android) {
      use_native_activity = true
-      configs -= [ "//build/config/android:hide_all_but_jni" ]
+      if (!export_libcxxabi_from_executables) {
+        # This config is already removed if(export_libcxxabi_from_executables)
+        configs -= [ "//build/config/android:hide_all_but_jni" ]
+      }
    }
    if (is_win) {
@@ -338,7 +342,10 @@ if (is_win || is_linux || is_android || is_mac) {
    if (is_android) {
      use_native_activity = true
-      configs -= [ "//build/config/android:hide_all_but_jni" ]
+      if (!export_libcxxabi_from_executables) {
+        # This config is already removed if(export_libcxxabi_from_executables)
+        configs -= [ "//build/config/android:hide_all_but_jni" ]
+      }
    }
    configs += [