diff options
| author | Elliott Hughes <enh@google.com> | 2018-02-20 02:11:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-20 02:11:33 +0000 |
| commit | 7e1b743846917d59d630aeb528f42322d8e005bb (patch) | |
| tree | ba77e11e0be3691c4c46274060e9c3ae7a4ff1bf | |
| parent | 4f8c3f04d6b2f9a99c854ec0251130e67a4ec750 (diff) | |
| parent | d162ef6c6753e70f6ffb83df451d308c31bd57bf (diff) | |
| download | unwinding-7e1b743846917d59d630aeb528f42322d8e005bb.tar.gz | |
Merge "bpfmt."
am: d162ef6c67
Change-Id: I810b09372da24d4b84bbeaa5d0c03ec0baf928fd
| -rw-r--r-- | libbacktrace/Android.bp | 13 | ||||
| -rw-r--r-- | libunwindstack/Android.bp | 10 |
2 files changed, 14 insertions, 9 deletions
diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp index be56531..4bd01d2 100644 --- a/libbacktrace/Android.bp +++ b/libbacktrace/Android.bp @@ -27,7 +27,6 @@ cc_defaults { include_dirs: ["external/libunwind/include/tdep"], - target: { darwin: { enabled: false, @@ -41,7 +40,7 @@ cc_defaults { lib64: { suffix: "64", }, - } + }, } libbacktrace_sources = [ @@ -84,8 +83,8 @@ cc_library { darwin: { enabled: true, shared_libs: [ - "libbase", - ], + "libbase", + ], }, linux: { srcs: libbacktrace_sources, @@ -106,7 +105,7 @@ cc_library { "art/runtime", ], - header_libs: [ "jni_headers", ], + header_libs: ["jni_headers"], }, android: { static_libs: ["libasync_safe"], @@ -114,7 +113,7 @@ cc_library { vendor: { cflags: ["-DNO_LIBDEXFILE_SUPPORT"], exclude_shared_libs: ["libdexfile"], - } + }, }, whole_static_libs: ["libdemangle"], } @@ -130,7 +129,7 @@ cc_library_shared { srcs: ["backtrace_testlib.cpp"], shared_libs: [ - "libunwindstack", + "libunwindstack", ], } diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp index a7bdd2e..124c70e 100644 --- a/libunwindstack/Android.bp +++ b/libunwindstack/Android.bp @@ -78,7 +78,10 @@ cc_library { target: { // Always disable optimizations for host to make it easier to debug. host: { - cflags: ["-O0", "-g"], + cflags: [ + "-O0", + "-g", + ], }, vendor: { cflags: ["-DNO_LIBDEXFILE_SUPPORT"], @@ -131,7 +134,10 @@ cc_library_static { target: { // Always disable optimizations for host to make it easier to debug. host: { - cflags: ["-O0", "-g"], + cflags: [ + "-O0", + "-g", + ], }, }, |