commit 621ea115e0b14467ae8f410ed6ad7a31bbe224e2
author Mike Klein <mtklein@chromium.org> Thu Jan 12 08:07:23 2017 -0500
committer Mike Klein <mtklein@chromium.org> Thu Jan 12 13:36:36 2017 +0000
tree 8dfe072a52877e4f4128f55ba578a16954aabf30
parent e7a364d435843a868dcac2c61d78c34e5d3e326c

only copy NDK binaries when using NDK in our standalone builds

  i.e. not when generating Android.bp (and in the future, not in Clank builds)

BUG=skia:6065

Change-Id: I52bdd5f01deb5e5b4d9e72bec197a82dc887be88
Reviewed-on: https://skia-review.googlesource.com/6941
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 90e8ffd..e214251 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1413,7 +1413,7 @@
     }
   }
 
-  if (is_android) {
+  if (is_android && is_skia_standalone && ndk != "") {
     copy("gdbserver") {
       sources = [
         "$ndk/$ndk_gdbserver",