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>

1 files changed, 4 insertions, 47 deletions

diff --git a/platform_tools/android/apps/skqp/build.gradle b/platform_tools/android/apps/skqp/build.gradle
index 7d747c1791..e368a66ef6 100644
--- a/platform_tools/android/apps/skqp/build.gradle
+++ b/platform_tools/android/apps/skqp/build.gradle
@@ -4,12 +4,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-
 apply plugin: 'com.android.application'
 
-//Make sure this is directory corresponds to skia/platform_tools/android
-final String ANDROID_CMAKE_HEADER_PATH = "../../CMakeLists.txt"
-
 dependencies {
     compile 'com.android.support:design:26.+'
     compile 'com.android.support.test:runner:0.5'
@@ -25,48 +21,9 @@ android {
         versionCode 1
         versionName "1.0"
         signingConfig signingConfigs.debug
-
-        externalNativeBuild {
-            cmake {
-                //Native libraries to build
-                targets "libskqp_app"
-
-                arguments "-DANDROID_STL=c++_static",
-                        "-DTARGETS=${android.defaultConfig.externalNativeBuild.cmake.targets}"
-            }
-        }
-
-        buildTypes {
-            debug {
-                applicationIdSuffix ".debug"
-                debuggable true
-            }
-        }
-
-        productFlavors {
-            arm {
-                ndk {
-                    abiFilters "armeabi-v7a"
-                }
-            }
-
-            x86 {
-                ndk {
-                    abiFilters "x86"
-                }
-            }
-
-            x64 {
-                ndk {
-                    abiFilters "x86_64"
-                }
-            }
-        }
-    }
-
-    externalNativeBuild {
-        cmake {
-            path ANDROID_CMAKE_HEADER_PATH
-        }
     }
+    sourceSets.main.jni.srcDirs = []
+    sourceSets.main.jniLibs.srcDir "src/main/libs"
+    productFlavors { universal{}; arm {}; arm64 {}; x86 {}; x64 {}; arm64vulkan{}; }
+    setupSkiaLibraryBuild(project, applicationVariants, "libskqp_app")
 }