diff --git a/cc/compiler.go b/cc/compiler.go index ef2228546..b9ba31a7b 100644 --- a/cc/compiler.go +++ b/cc/compiler.go @@ -106,6 +106,9 @@ type BaseCompilerProperties struct { // list of directories relative to the Blueprints file that will // be added to the aidl include paths. Local_include_dirs []string + + // whether to generate traces (for systrace) for this interface + Generate_traces *bool } Renderscript struct { @@ -477,6 +480,10 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps flags.aidlFlags = append(flags.aidlFlags, includeDirsToFlags(rootAidlIncludeDirs)) } + if Bool(compiler.Properties.Aidl.Generate_traces) { + flags.aidlFlags = append(flags.aidlFlags, "-t") + } + flags.GlobalFlags = append(flags.GlobalFlags, "-I"+android.PathForModuleGen(ctx, "aidl").String()) } diff --git a/java/java.go b/java/java.go index ae48bd658..8cfbf05a3 100644 --- a/java/java.go +++ b/java/java.go @@ -175,6 +175,9 @@ type CompilerDeviceProperties struct { // directories that should be added as include directories for any aidl sources of modules // that depend on this module, as well as to aidl for this module. Export_include_dirs []string + + // whether to generate traces (for systrace) for this interface + Generate_traces *bool } // If true, export a copy of the module as a -hostdex module for host testing. @@ -534,6 +537,10 @@ func (j *Module) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.Opt flags = append(flags, "-I"+src.String()) } + if Bool(j.deviceProperties.Aidl.Generate_traces) { + flags = append(flags, "-t") + } + return flags }