aboutsummaryrefslogtreecommitdiffhomepage
path: root/gn/BUILD.gn
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2018-06-01 20:22:25 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-01 20:22:37 +0000
commita0834048380c51f9e45063e3ae40a142a6f7f2d1 (patch)
tree1e57c75af9d7b3f1e314029c230bce4ebdcbb5de /gn/BUILD.gn
parent804d0f28ba6de89b7e671c0e9192e16b7494944d (diff)
Revert "Added support for visual debugging on Android Studio"
This reverts commit 222c9cfd1b3f50d21d4a1f93b0b52dd4973fe1b5. Reason for revert: Breaks documented workflow. Original change's description: > 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> TBR=djsollen@google.com,mtklein@google.com,bsalomon@google.com,halcanary@google.com,bungeman@google.com,ziadb@google.com Change-Id: I6e7ac2d16d9a0f267d75cd202fd4975be36da4f5 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/131601 Reviewed-by: Hal Canary <halcanary@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'gn/BUILD.gn')
-rw-r--r--gn/BUILD.gn2
1 files changed, 1 insertions, 1 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index 80b7f3f1bc..2e38e27060 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -143,7 +143,7 @@ config("default") {
libs += [ malloc ]
}
- if (is_android && !is_android_cmake) {
+ if (is_android) {
asmflags += [ "--target=$ndk_target" ]
cflags += [
"--sysroot=$ndk/sysroot",