ANDROID: Android.bp: Build for /vendor am: 45bcdaf85b Original change: https://android-review.googlesource.com/c/platform/external/trace-cmd/+/3470040 Change-Id: Ic585b41efeed4ce0004847a00daa6d3ac0d53a3a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp index 79f7f6a..e012185 100644 --- a/Android.bp +++ b/Android.bp
@@ -129,38 +129,50 @@ c_std: "gnu99", } +tracecmd_cflags = [ + "-D_GNU_SOURCE", + "-DNO_AUDIT", + "-DVSOCK", + // strstrip() is defined in libtracefs too; change our name to avoid + // duplicate symbols when statically linking. + "-Dstrstrip=strstrip_trace", + "-Wno-unused-parameter", + "-Wno-macro-redefined", + "-Wno-visibility", + "-Wno-pointer-arith", +] + +tracecmd_includes = [ + "lib/trace-cmd/include/private", + "include/trace-cmd", + "tracecmd/include", + "include", +] + +tracecmd_libs = [ + "libtraceevent", + "libtracecmd", + "libtracefs", +] + cc_binary { name: "trace-cmd", + vendor: true, - local_include_dirs: [ - "lib/trace-cmd/include/private", - "include/trace-cmd", - "tracecmd/include", - "include", - ], - + local_include_dirs: tracecmd_includes, srcs: ["tracecmd/*.c"], + static_libs: tracecmd_libs, + cflags: tracecmd_cflags, + c_std: "gnu99", +} - static_libs: [ - "libtraceevent", - "libtracecmd", - "libtracefs", - ], +cc_binary { + name: "trace-cmd_static", + local_include_dirs: tracecmd_includes, + srcs: ["tracecmd/*.c"], + static_libs: tracecmd_libs, static_executable: true, - - cflags: [ - "-D_GNU_SOURCE", - "-DNO_AUDIT", - "-DVSOCK", - // strstrip() is defined in libtracefs too; change our name to avoid - // duplicate symbols when statically linking. - "-Dstrstrip=strstrip_trace", - "-Wno-unused-parameter", - "-Wno-macro-redefined", - "-Wno-visibility", - "-Wno-pointer-arith", - ], - + cflags: tracecmd_cflags, c_std: "gnu99", }