From 222c9cfd1b3f50d21d4a1f93b0b52dd4973fe1b5 Mon Sep 17 00:00:00 2001
From: ziadb <ziadb@google.com>
Date: Thu, 31 May 2018 15:55:09 -0400
Subject: Added support for visual debugging on Android Studio

Change-Id: Icaf848c31167db10d6fbb13d74c7287b03628fb6
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/130144
Reviewed-by: Derek Sollenberger <djsollen@google.com>
---
 gn/BUILD.gn       | 2 +-
 gn/BUILDCONFIG.gn | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'gn')

diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index 7a6a8211d5..9d65118c96 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -143,7 +143,7 @@ config("default") {
     libs += [ malloc ]
   }
 
-  if (is_android) {
+  if (is_android && !is_android_cmake) {
     asmflags += [ "--target=$ndk_target" ]
     cflags += [
       "--sysroot=$ndk/sysroot",
diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn
index e5440b9b76..3d4d65ad6e 100644
--- a/gn/BUILDCONFIG.gn
+++ b/gn/BUILDCONFIG.gn
@@ -10,6 +10,7 @@ is_skia_standalone = true
 declare_args() {
   is_official_build = false
   is_component_build = false
+  is_android_cmake = false
   ndk = ""
 
   # It's nice to keep ndk_api set to what Clank targets, but probably no big deal if we can't.
@@ -37,6 +38,7 @@ declare_args() {
   skia_vulkan_sdk = getenv("VULKAN_SDK")
   skia_moltenvk_path = ""
 }
+
 declare_args() {
   is_debug = !is_official_build
 }
-- 
cgit v1.2.3