Always depend on libandroid for angle_util.

libnativewindow doesn't have all the functions angle_util requires, namely: AConfiguration_*, AInputEvent_*, AInputQueue_*, ALooper_*. It should be safe to always use libandroid, since angle_util is only used by tests, thus it won't interfere with AngleLibraries.apk Bug: angleproject:2418 Change-Id: I8343924629205bfb5d65dafe34db8e2baa987bae Reviewed-on: https://chromium-review.googlesource.com/1108747Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

Always depend on libandroid for angle_util.
cd70aa42 · Yuly Novikov · Commit Bot · d11efaec · cd70aa42
Commit cd70aa42 authored Jun 20, 2018 by Yuly Novikov Committed by Commit Bot Jun 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

BUILD.gn BUILD.gn +4 -6

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -865,12 +865,10 @@ foreach(is_shared_library,
      set_sources_assignment_filter([])
      sources += rebase_path(util_gypi.util_linux_sources, ".", "util")
      sources += rebase_path(util_gypi.util_android_sources, ".", "util")
-      if (ndk_supports_nativewindow) {
+      libs += [
-        libs += [ "nativewindow" ]
+        "android",
-      } else {
+        "log",
-        libs += [ "android" ]
+      ]
-      }
-      libs += [ "log" ]
    }
    if (use_ozone) {