Rearrange Android lib deps

Vulkan backend was missing dependency on NativeWindow. Bug: angleproject:2314 Change-Id: I66675af6f885b57bdb0524a0626dfec0256a21d3 Reviewed-on: https://chromium-review.googlesource.com/c/1354100Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

Rearrange Android lib deps
b29fccfe · Yuly Novikov · Commit Bot · c4e0a1e5 · b29fccfe
Commit b29fccfe authored Nov 28, 2018 by Yuly Novikov Committed by Commit Bot Nov 28, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 6 deletions

BUILD.gn BUILD.gn +9 -6

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -418,6 +418,7 @@ if (angle_use_commit_id) {
 config("libANGLE_config") {
  cflags = []
  defines = []
+  libs = []
  if (angle_enable_d3d9) {
    defines += [ "ANGLE_ENABLE_D3D9" ]
  }
@@ -444,6 +445,14 @@ config("libANGLE_config") {
  if (is_win) {
    cflags += [ "/wd4530" ]  # C++ exception handler used, but unwind semantics are not enabled.
  }
+
+  if (is_android && (angle_enable_gl || angle_enable_vulkan)) {
+    if (ndk_supports_nativewindow) {
+      libs += [ "nativewindow" ]
+    } else {
+      libs += [ "android" ]
+    }
+  }
 }

 if (angle_enable_vulkan) {
@@ -549,12 +558,6 @@ static_library("libANGLE") {
      sources += libangle_gl_egl_sources
      sources += libangle_gl_egl_dl_sources
      sources += libangle_gl_egl_android_sources
-      if (ndk_supports_nativewindow) {
-        libs += [ "nativewindow" ]
-      } else {
-        libs += [ "android" ]
-      }
-      libs += [ "log" ]
    }
    if (ozone_platform_gbm) {
      configs += [ ":libdrm" ]