diff options
| -rw-r--r-- | android/compliance_metadata.go | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/android/compliance_metadata.go b/android/compliance_metadata.go index 1e1f4bc60..35805a2a8 100644 --- a/android/compliance_metadata.go +++ b/android/compliance_metadata.go @@ -244,18 +244,6 @@ var ( `${sqlite3} $out ".import --csv ${make_modules} make_modules"`, CommandDeps: []string{"${sqlite3}"}, }, "make_metadata", "make_modules") - - buildMakeMetadataCsv = pctx.AndroidStaticRule("buildMakeMetadataCsv", - blueprint.RuleParams{ - Command: `rm -rf $out && ` + - `echo "installed_file,module_path,is_soong_module,is_prebuilt_make_module,product_copy_files,kernel_module_copy_files,is_platform_generated,static_libs,whole_static_libs,license_text" > $out`, - }) - - buildMakeModulesCsv = pctx.AndroidStaticRule("buildMakeModulesCsv", - blueprint.RuleParams{ - Command: `rm -rf $out && ` + - `echo "name,module_path,module_class,module_type,static_libs,whole_static_libs,built_files,installed_files" > $out`, - }) ) func complianceMetadataSingletonFactory() Singleton { @@ -328,14 +316,8 @@ func (c *complianceMetadataSingleton) GenerateBuildActions(ctx SingletonContext) makeModulesCsv := PathForOutput(ctx, "compliance-metadata", deviceProduct, "make-modules.csv") if !ctx.Config().KatiEnabled() { - ctx.Build(pctx, BuildParams{ - Rule: buildMakeMetadataCsv, - Output: makeMetadataCsv, - }) - ctx.Build(pctx, BuildParams{ - Rule: buildMakeModulesCsv, - Output: makeModulesCsv, - }) + WriteFileRule(ctx, makeMetadataCsv, "installed_file,module_path,is_soong_module,is_prebuilt_make_module,product_copy_files,kernel_module_copy_files,is_platform_generated,static_libs,whole_static_libs,license_text") + WriteFileRule(ctx, makeModulesCsv, "name,module_path,module_class,module_type,static_libs,whole_static_libs,built_files,installed_files") } // Import metadata from Make and Soong to sqlite3 database |