Support Android NDK r14.

simpleperf has moved a little since r13.  To support both, remove its
copy step.

Explicitly disable the Clang integrated assembler on MIPS.  It has only
understood the 'usw' (unaligned store) pseudoinstruction for about 4
months, and that won't be part of a Clang release until the upcoming
Clang 4.0.  Must be that -no-integrated-as was the default in r13.

All six platforms build on my laptop with r14 now.
Will follow up with the CL that moves the bots to r14.

CQ_INCLUDE_TRYBOTS=skia.primary:Build-Mac-Clang-arm64-Debug-Android,Build-Ubuntu-Clang-arm-Debug-Android,Build-Ubuntu-Clang-arm64-Debug-Android,Build-Ubuntu-Clang-mips64el-Debug-Android,Build-Ubuntu-Clang-mipsel-Debug-Android,Build-Ubuntu-Clang-x64-Debug-Android,Build-Ubuntu-Clang-x86-Debug-Android,Build-Win-Clang-arm64-Release-Android

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

3 files changed, 1 insertions, 16 deletions

diff --git a/BUILD.gn b/BUILD.gn
index e2cdb4fbbf..dcc579dead 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1459,17 +1459,6 @@ if (skia_enable_tools) {
         "$root_out_dir/gdbserver",
       ]
     }
-    if (ndk_simpleperf != "") {
-      copy("simpleperf") {
-        sources = [
-          "$ndk/$ndk_simpleperf",
-          "$ndk/simpleperf/simpleperf_report.py",
-        ]
-        outputs = [
-          "$root_out_dir/{{source_file_part}}",
-        ]
-      }
-    }
   }
 
   if (skia_enable_gpu) {
diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index aea5294977..9c1ee9e73a 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -126,6 +126,7 @@ config("default") {
     ]
   } else if (current_cpu == "mipsel") {
     cflags += [
+      "-no-integrated-as",  # Clang <4.0 doesn't understand 'usw' mnemonic.
       "-march=mips32r2",
       "-mdspr2",
     ]
diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn
index a89931b432..6ec5e67fe2 100644
--- a/gn/BUILDCONFIG.gn
+++ b/gn/BUILDCONFIG.gn
@@ -62,7 +62,6 @@ if (is_android) {
   ndk_stdlib = ""
   ndk_gccdir = ""
   ndk_gdbserver = ""
-  ndk_simpleperf = ""
 
   if (host_os == "linux") {
     ndk_host = "linux-x86_64"
@@ -78,14 +77,12 @@ if (is_android) {
     ndk_stdlib = "arm64-v8a"
     ndk_gccdir = ndk_target
     ndk_gdbserver = "prebuilt/android-arm64/gdbserver/gdbserver"
-    ndk_simpleperf = "simpleperf/android/arm64/simpleperf"
   } else if (target_cpu == "arm") {
     ndk_target = "arm-linux-androideabi"
     ndk_platform = "android-${ndk_api}/arch-arm"
     ndk_stdlib = "armeabi-v7a"
     ndk_gccdir = ndk_target
     ndk_gdbserver = "prebuilt/android-arm/gdbserver/gdbserver"
-    ndk_simpleperf = "simpleperf/android/arm/simpleperf"
   } else if (target_cpu == "mips64el") {
     ndk_target = "mips64el-linux-android"
     ndk_platform = "android-${ndk_api}/arch-mips64"
@@ -104,14 +101,12 @@ if (is_android) {
     ndk_stdlib = "x86_64"
     ndk_gccdir = ndk_stdlib
     ndk_gdbserver = "prebuilt/android-x86_64/gdbserver/gdbserver"
-    ndk_simpleperf = "simpleperf/android/x86_64/simpleperf"
   } else if (target_cpu == "x86") {
     ndk_target = "i686-linux-android"
     ndk_platform = "android-${ndk_api}/arch-x86"
     ndk_stdlib = "x86"
     ndk_gccdir = ndk_stdlib
     ndk_gdbserver = "prebuilt/android-x86/gdbserver/gdbserver"
-    ndk_simpleperf = "simpleperf/android/x86/simpleperf"
   }
 }