diff options
| -rw-r--r-- | perfprofd/Android.bp | 59 | ||||
| l--------- | perfprofd/simpleperf | 1 | ||||
| -rw-r--r-- | perfprofd/tests/Android.bp | 2 | ||||
| -rw-r--r-- | simpleperf/Android.bp | 92 |
4 files changed, 95 insertions, 59 deletions
diff --git a/perfprofd/Android.bp b/perfprofd/Android.bp index 3f255448..aef9c23c 100644 --- a/perfprofd/Android.bp +++ b/perfprofd/Android.bp @@ -42,61 +42,6 @@ cc_defaults { } // -// Static library for ELF symbolization. -// -// TODO: make this a proper part of simpleperf once that is moved to Soong. -// - -cc_library_static { - name: "libperfprofd_elf_read", - defaults: [ - "perfprofd_defaults", - ], - - export_include_dirs: [ - "simpleperf", - ], - - cflags: [ - "-DSIMPLEPERF_REVISION=\"dummy\"", - ], - - static_libs: [ - "libbase", - ], - // Use whole-static to avoid having to pull this in later. - whole_static_libs: [ - "libLLVMObject", - "libLLVMBitReader", - "libLLVMMC", - "libLLVMMCParser", - "libLLVMCore", - "libLLVMSupport", - "liblog", - "liblzma", - "libz", - "libziparchive", - ], - - target: { - // Required for LLVM. - linux_glibc: { - host_ldlibs: [ - "-lncurses", - ], - }, - }, - - srcs: [ - "simpleperf/read_apk.cpp", - "simpleperf/read_elf.cpp", - "simpleperf/utils.cpp", - ], - - group_static_libs: true, -} - -// // Static library containing guts of AWP daemon. // @@ -110,7 +55,7 @@ cc_library_static { export_include_dirs: ["."], static_libs: [ "libbase", - "libperfprofd_elf_read", + "libsimpleperf_elf_read", ], srcs: [ "perf_profile.proto", @@ -147,7 +92,7 @@ cc_binary { static_libs: [ "libperfprofdcore", "libperfprofd_binder", - "libperfprofd_elf_read", + "libsimpleperf_elf_read", ], group_static_libs: true, diff --git a/perfprofd/simpleperf b/perfprofd/simpleperf deleted file mode 120000 index 9878956e..00000000 --- a/perfprofd/simpleperf +++ /dev/null @@ -1 +0,0 @@ -../simpleperf
\ No newline at end of file diff --git a/perfprofd/tests/Android.bp b/perfprofd/tests/Android.bp index 23d9adbe..861ef3a4 100644 --- a/perfprofd/tests/Android.bp +++ b/perfprofd/tests/Android.bp @@ -32,7 +32,7 @@ cc_test { stl: "libc++", static_libs: [ "libperfprofdcore", - "libperfprofd_elf_read", + "libsimpleperf_elf_read", "libbase", ], shared_libs: [ diff --git a/simpleperf/Android.bp b/simpleperf/Android.bp new file mode 100644 index 00000000..8090c178 --- /dev/null +++ b/simpleperf/Android.bp @@ -0,0 +1,92 @@ +// +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +cc_defaults { + name: "simpleperf_defaults", + + cflags: [ + "-Wall", + "-Wextra", + "-Werror", + + // Try some more extreme warnings. + "-Wpedantic", + "-Wunreachable-code-aggressive", + // And disable some dumb things. + "-Wno-zero-length-array", + "-Wno-c99-extensions", + "-Wno-language-extension-token", + "-Wno-gnu-zero-variadic-macro-arguments", + "-Wno-nested-anon-types", + "-Wno-gnu-statement-expression", + "-Wno-vla-extension", + "-Wno-extended-offsetof", + ], + cppflags: [ + "-Wno-sign-compare", + "-Wno-unused-parameter", + ], +} + +cc_library_static { + name: "libsimpleperf_elf_read", + defaults: [ + "simpleperf_defaults", + ], + + export_include_dirs: [ + ".", + ], + + // TODO: fix or workaround this. + cflags: [ + "-DSIMPLEPERF_REVISION=\"dummy\"", + ], + + static_libs: [ + "libbase", + ], + // Use whole-static to avoid having to pull this in later. + whole_static_libs: [ + "libLLVMObject", + "libLLVMBitReader", + "libLLVMMC", + "libLLVMMCParser", + "libLLVMCore", + "libLLVMSupport", + "liblog", + "liblzma", + "libz", + "libziparchive", + ], + + target: { + // Required for LLVM. + linux_glibc: { + host_ldlibs: [ + "-lncurses", + ], + }, + }, + + srcs: [ + "read_apk.cpp", + "read_elf.cpp", + "utils.cpp", + ], + + group_static_libs: true, +}
\ No newline at end of file |