Merge "bpfmt."
This commit is contained in:
commit
0609e8d231
30 changed files with 148 additions and 86 deletions
|
@ -13,39 +13,39 @@
|
|||
// limitations under the License.
|
||||
|
||||
python_binary_host {
|
||||
name: "adb_integration_test_adb",
|
||||
main: "test_adb.py",
|
||||
srcs: [
|
||||
"test_adb.py",
|
||||
],
|
||||
libs: [
|
||||
"adb_py",
|
||||
],
|
||||
version: {
|
||||
py2: {
|
||||
enabled: true,
|
||||
name: "adb_integration_test_adb",
|
||||
main: "test_adb.py",
|
||||
srcs: [
|
||||
"test_adb.py",
|
||||
],
|
||||
libs: [
|
||||
"adb_py",
|
||||
],
|
||||
version: {
|
||||
py2: {
|
||||
enabled: true,
|
||||
},
|
||||
py3: {
|
||||
enabled: false,
|
||||
},
|
||||
},
|
||||
py3: {
|
||||
enabled: false,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
python_binary_host {
|
||||
name: "adb_integration_test_device",
|
||||
main: "test_device.py",
|
||||
srcs: [
|
||||
"test_device.py",
|
||||
],
|
||||
libs: [
|
||||
"adb_py",
|
||||
],
|
||||
version: {
|
||||
py2: {
|
||||
enabled: true,
|
||||
name: "adb_integration_test_device",
|
||||
main: "test_device.py",
|
||||
srcs: [
|
||||
"test_device.py",
|
||||
],
|
||||
libs: [
|
||||
"adb_py",
|
||||
],
|
||||
version: {
|
||||
py2: {
|
||||
enabled: true,
|
||||
},
|
||||
py3: {
|
||||
enabled: false,
|
||||
},
|
||||
},
|
||||
py3: {
|
||||
enabled: false,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
@ -16,7 +16,11 @@
|
|||
|
||||
cc_defaults {
|
||||
name: "libbase_defaults",
|
||||
cflags: ["-Wall", "-Werror", "-Wextra"],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
"-Wextra",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library_headers {
|
||||
|
|
|
@ -16,7 +16,7 @@ cc_defaults {
|
|||
|
||||
cc_library_headers {
|
||||
name: "libdebuggerd_common_headers",
|
||||
export_include_dirs: ["common/include"]
|
||||
export_include_dirs: ["common/include"],
|
||||
}
|
||||
|
||||
cc_library_shared {
|
||||
|
@ -39,7 +39,7 @@ cc_library_shared {
|
|||
],
|
||||
|
||||
export_header_lib_headers: ["libdebuggerd_common_headers"],
|
||||
export_include_dirs: ["tombstoned/include"]
|
||||
export_include_dirs: ["tombstoned/include"],
|
||||
}
|
||||
|
||||
// Utility library to tombstoned and get an output fd.
|
||||
|
@ -60,7 +60,7 @@ cc_library_static {
|
|||
],
|
||||
|
||||
export_header_lib_headers: ["libdebuggerd_common_headers"],
|
||||
export_include_dirs: ["tombstoned/include"]
|
||||
export_include_dirs: ["tombstoned/include"],
|
||||
}
|
||||
|
||||
// Core implementation, linked into libdebuggerd_handler and the dynamic linker.
|
||||
|
@ -186,7 +186,10 @@ cc_test {
|
|||
"client/debuggerd_client_test.cpp",
|
||||
"debuggerd_test.cpp",
|
||||
],
|
||||
static_libs: ["libasync_safe", "libtombstoned_client_static"],
|
||||
static_libs: [
|
||||
"libasync_safe",
|
||||
"libtombstoned_client_static",
|
||||
],
|
||||
},
|
||||
},
|
||||
|
||||
|
@ -197,7 +200,7 @@ cc_test {
|
|||
"libdebuggerd_client",
|
||||
"liblog",
|
||||
"libminijail",
|
||||
"libnativehelper"
|
||||
"libnativehelper",
|
||||
],
|
||||
|
||||
static_libs: [
|
||||
|
@ -298,7 +301,7 @@ cc_binary {
|
|||
"liblog",
|
||||
],
|
||||
|
||||
init_rc: ["tombstoned/tombstoned.rc"]
|
||||
init_rc: ["tombstoned/tombstoned.rc"],
|
||||
}
|
||||
|
||||
subdirs = [
|
||||
|
|
|
@ -42,11 +42,11 @@ cc_library {
|
|||
],
|
||||
|
||||
local_include_dirs: [
|
||||
"include",
|
||||
"include",
|
||||
],
|
||||
|
||||
export_include_dirs: [
|
||||
"include",
|
||||
"include",
|
||||
],
|
||||
}
|
||||
|
||||
|
|
|
@ -56,7 +56,7 @@ cc_defaults {
|
|||
},
|
||||
uml: {
|
||||
cppflags: ["-DUSER_MODE_LINUX"],
|
||||
}
|
||||
},
|
||||
},
|
||||
static_libs: [
|
||||
"libbootloader_message",
|
||||
|
|
|
@ -17,7 +17,10 @@
|
|||
cc_binary {
|
||||
name: "test_service",
|
||||
srcs: ["test_service.cpp"],
|
||||
cflags: ["-Wall", "-Werror"],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
shared_libs: ["libbase"],
|
||||
init_rc: ["test_service.rc"],
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@ cc_library_shared {
|
|||
"FuseBuffer.cc",
|
||||
"FuseBridgeLoop.cc",
|
||||
"EpollController.cc",
|
||||
]
|
||||
],
|
||||
}
|
||||
|
||||
cc_test {
|
||||
|
@ -31,5 +31,5 @@ cc_test {
|
|||
"tests/FuseAppLoopTest.cc",
|
||||
"tests/FuseBridgeLoopTest.cc",
|
||||
"tests/FuseBufferTest.cc",
|
||||
]
|
||||
],
|
||||
}
|
||||
|
|
|
@ -16,7 +16,11 @@
|
|||
|
||||
cc_defaults {
|
||||
name: "libasyncio_defaults",
|
||||
cflags: ["-Wall", "-Werror", "-Wextra"],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
"-Wextra",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library {
|
||||
|
|
|
@ -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",
|
||||
],
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
cc_library {
|
||||
name: "libion",
|
||||
vendor_available: true,
|
||||
|
|
|
@ -16,7 +16,7 @@ cc_defaults {
|
|||
},
|
||||
host: {
|
||||
shared_libs: ["liblog"],
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
|
||||
cc_library_headers {
|
||||
name: "libnativebridge-dummy-headers",
|
||||
|
||||
host_supported: true,
|
||||
export_include_dirs=["include"],
|
||||
export_include_dirs: ["include"],
|
||||
}
|
||||
|
||||
cc_library {
|
||||
|
@ -11,9 +10,12 @@ cc_library {
|
|||
|
||||
host_supported: true,
|
||||
srcs: ["native_bridge.cc"],
|
||||
shared_libs: ["liblog", "libbase"],
|
||||
shared_libs: [
|
||||
"liblog",
|
||||
"libbase",
|
||||
],
|
||||
|
||||
export_include_dirs=["include"],
|
||||
export_include_dirs: ["include"],
|
||||
|
||||
cflags: [
|
||||
"-Werror",
|
||||
|
|
|
@ -17,31 +17,34 @@
|
|||
cc_library {
|
||||
name: "libfoo.oem1",
|
||||
srcs: ["test.cpp"],
|
||||
cflags : ["-DLIBNAME=\"libfoo.oem1.so\""],
|
||||
cflags: ["-DLIBNAME=\"libfoo.oem1.so\""],
|
||||
shared_libs: [
|
||||
"libbase",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "libbar.oem1",
|
||||
srcs: ["test.cpp"],
|
||||
cflags : ["-DLIBNAME=\"libbar.oem1.so\""],
|
||||
cflags: ["-DLIBNAME=\"libbar.oem1.so\""],
|
||||
shared_libs: [
|
||||
"libbase",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "libfoo.oem2",
|
||||
srcs: ["test.cpp"],
|
||||
cflags : ["-DLIBNAME=\"libfoo.oem2.so\""],
|
||||
cflags: ["-DLIBNAME=\"libfoo.oem2.so\""],
|
||||
shared_libs: [
|
||||
"libbase",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "libbar.oem2",
|
||||
srcs: ["test.cpp"],
|
||||
cflags : ["-DLIBNAME=\"libbar.oem2.so\""],
|
||||
cflags: ["-DLIBNAME=\"libbar.oem2.so\""],
|
||||
shared_libs: [
|
||||
"libbase",
|
||||
],
|
||||
|
|
|
@ -2,7 +2,10 @@ cc_library {
|
|||
|
||||
name: "libpackagelistparser",
|
||||
srcs: ["packagelistparser.c"],
|
||||
cflags: ["-Wall", "-Werror"],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
shared_libs: ["liblog"],
|
||||
local_include_dirs: ["include"],
|
||||
export_include_dirs: ["include"],
|
||||
|
|
|
@ -16,7 +16,11 @@
|
|||
|
||||
cc_defaults {
|
||||
name: "libprocinfo_defaults",
|
||||
cflags: ["-Wall", "-Werror", "-Wextra"],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
"-Wextra",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library {
|
||||
|
@ -65,7 +69,10 @@ cc_test {
|
|||
},
|
||||
},
|
||||
|
||||
shared_libs: ["libbase", "libprocinfo"],
|
||||
shared_libs: [
|
||||
"libbase",
|
||||
"libprocinfo",
|
||||
],
|
||||
|
||||
compile_multilib: "both",
|
||||
multilib: {
|
||||
|
|
|
@ -11,5 +11,5 @@ cc_library_headers {
|
|||
windows: {
|
||||
enabled: true,
|
||||
},
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
|
@ -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",
|
||||
],
|
||||
},
|
||||
},
|
||||
|
||||
|
|
|
@ -20,12 +20,12 @@ cc_library_headers {
|
|||
header_libs: [
|
||||
"liblog_headers",
|
||||
"libsystem_headers",
|
||||
"libcutils_headers"
|
||||
"libcutils_headers",
|
||||
],
|
||||
export_header_lib_headers: [
|
||||
"liblog_headers",
|
||||
"libsystem_headers",
|
||||
"libcutils_headers"
|
||||
"libcutils_headers",
|
||||
],
|
||||
export_include_dirs: ["include"],
|
||||
|
||||
|
@ -52,7 +52,10 @@ cc_defaults {
|
|||
},
|
||||
host_supported: true,
|
||||
|
||||
cflags: ["-Wall", "-Werror"],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
include_dirs: ["external/safe-iop/include"],
|
||||
header_libs: [
|
||||
"libutils_headers",
|
||||
|
@ -193,7 +196,10 @@ cc_test {
|
|||
static_libs: ["libutils"],
|
||||
shared_libs: ["liblog"],
|
||||
srcs: ["SharedBufferTest.cpp"],
|
||||
cflags: ["-Wall", "-Werror"],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
}
|
||||
|
||||
subdirs = ["tests"]
|
||||
|
|
|
@ -77,7 +77,10 @@ cc_test_library {
|
|||
host_supported: true,
|
||||
relative_install_path: "libutils_tests",
|
||||
srcs: ["Singleton_test1.cpp"],
|
||||
cflags: ["-Wall", "-Werror"],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
}
|
||||
|
||||
cc_test_library {
|
||||
|
@ -85,6 +88,9 @@ cc_test_library {
|
|||
host_supported: true,
|
||||
relative_install_path: "libutils_tests",
|
||||
srcs: ["Singleton_test2.cpp"],
|
||||
cflags: ["-Wall", "-Werror"],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
shared_libs: ["libutils_tests_singleton1"],
|
||||
}
|
||||
|
|
|
@ -3,7 +3,10 @@ subdirs = ["tests"]
|
|||
cc_library {
|
||||
name: "libvndksupport",
|
||||
srcs: ["linker.c"],
|
||||
cflags: ["-Wall", "-Werror"],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
local_include_dirs: ["include/vndksupport"],
|
||||
export_include_dirs: ["include"],
|
||||
shared_libs: ["liblog"],
|
||||
|
|
|
@ -17,11 +17,14 @@ cc_test {
|
|||
srcs: [
|
||||
"linker_test.cpp",
|
||||
],
|
||||
cflags: ["-Wall", "-Werror"],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
|
||||
host_supported: false,
|
||||
shared_libs: [
|
||||
"libvndksupport",
|
||||
"libbase",
|
||||
]
|
||||
],
|
||||
}
|
||||
|
|
|
@ -68,8 +68,11 @@ cc_prebuilt_binary {
|
|||
srcs: ["logpersist"],
|
||||
init_rc: ["logcatd.rc"],
|
||||
required: ["logcatd"],
|
||||
symlinks: ["logpersist.stop", "logpersist.cat"],
|
||||
symlinks: [
|
||||
"logpersist.stop",
|
||||
"logpersist.cat",
|
||||
],
|
||||
strip: {
|
||||
none: true,
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@ event_flag = [
|
|||
"-DAUDITD_LOG_TAG=1003",
|
||||
"-DCHATTY_LOG_TAG=1004",
|
||||
"-DTAG_DEF_LOG_TAG=1005",
|
||||
"-DLIBLOG_LOG_TAG=1006"
|
||||
"-DLIBLOG_LOG_TAG=1006",
|
||||
]
|
||||
|
||||
cc_library_static {
|
||||
|
|
|
@ -49,5 +49,5 @@ cc_benchmark {
|
|||
],
|
||||
cflags: [
|
||||
"-Werror",
|
||||
]
|
||||
],
|
||||
}
|
||||
|
|
|
@ -31,7 +31,10 @@ cc_binary {
|
|||
"trusty_keymaster_ipc.cpp",
|
||||
"trusty_keymaster_main.cpp",
|
||||
],
|
||||
cflags: ["-Wall", "-Werror"],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
shared_libs: [
|
||||
"libcrypto",
|
||||
"libcutils",
|
||||
|
|
|
@ -22,7 +22,10 @@ cc_library {
|
|||
|
||||
srcs: ["trusty.c"],
|
||||
export_include_dirs: ["include"],
|
||||
cflags: ["-Wall", "-Werror"],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
|
||||
shared_libs: ["liblog"],
|
||||
}
|
||||
|
|
|
@ -25,5 +25,8 @@ cc_test {
|
|||
"liblog",
|
||||
],
|
||||
gtest: false,
|
||||
cflags: ["-Wall", "-Werror"],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
}
|
||||
|
|
|
@ -34,5 +34,5 @@ cc_library_static {
|
|||
"-fvisibility=hidden",
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
]
|
||||
],
|
||||
}
|
||||
|
|
|
@ -36,5 +36,5 @@ cc_binary {
|
|||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
]
|
||||
],
|
||||
}
|
||||
|
|
|
@ -13,4 +13,3 @@ cc_binary {
|
|||
"libcutils",
|
||||
],
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue