diff options
| -rw-r--r-- | BUILD.gn | 11 | ||||
| -rw-r--r-- | gn/BUILD.gn | 1 | ||||
| -rw-r--r-- | gn/BUILDCONFIG.gn | 5 |
3 files changed, 1 insertions, 16 deletions
@@ -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" } } |