Merge "Create the filegroup to collect cert files for otatools.zip" into main
diff --git a/android/Android.bp b/android/Android.bp
index 00dc50a..4b75148 100644
--- a/android/Android.bp
+++ b/android/Android.bp
@@ -171,3 +171,7 @@
// Used by plugins
visibility: ["//visibility:public"],
}
+
+otatools_package_filegroup {
+ name: "otatools_package_filegroup",
+}
diff --git a/android/filegroup.go b/android/filegroup.go
index 4fad52a..9bcfd0a 100644
--- a/android/filegroup.go
+++ b/android/filegroup.go
@@ -33,6 +33,7 @@
func RegisterFilegroupBuildComponents(ctx RegistrationContext) {
ctx.RegisterModuleType("filegroup", FileGroupFactory)
ctx.RegisterModuleType("filegroup_defaults", FileGroupDefaultsFactory)
+ ctx.RegisterModuleType("otatools_package_filegroup", OtatoolsFileGroupFactory)
}
type fileGroupProperties struct {
@@ -163,3 +164,54 @@
}
}
}
+
+type OtatoolsFileGroup struct {
+ ModuleBase
+}
+
+func OtatoolsFileGroupFactory() Module {
+ module := &OtatoolsFileGroup{}
+ InitAndroidModule(module)
+ AddLoadHook(module, func(ctx LoadHookContext) {
+ module.createOTAToolsPackagefilegroup(ctx)
+ })
+ return module
+}
+
+func (fg *OtatoolsFileGroup) GenerateAndroidBuildActions(ctx ModuleContext) {
+}
+
+// Create the filegroup to collect cert files for otatools.zip.
+func (fg *OtatoolsFileGroup) createOTAToolsPackagefilegroup(ctx LoadHookContext) {
+ ctx.CreateModuleInDirectory(
+ FileGroupFactory,
+ ".",
+ &struct {
+ Name *string
+ Srcs []string
+ Visibility []string
+ }{
+ Name: proptools.StringPtr("soong_generated_otatools_package_filegroup"),
+ Srcs: []string{
+ "build/make/target/product/security/**/*.x509.pem",
+ "build/make/target/product/security/**/*.pk8",
+ "device/**/*.pk8",
+ "device/**/verifiedboot*",
+ "device/**/*.pem",
+ "device/**/oem*.prop",
+ "device/**/*.avbpubkey",
+ "external/avb/test/data/**/testkey_*.pem",
+ "external/avb/test/data/**/atx_metadata.bin",
+ "packages/modules/**/*.x509.pem",
+ "packages/modules/**/*.pk8",
+ "packages/modules/**/*.key.pem",
+ "vendor/**/*.pk8",
+ "vendor/**/verifiedboot*",
+ "vendor/**/*.pem",
+ "vendor/**/oem*.prop",
+ "vendor/**/*.avbpubkey",
+ },
+ Visibility: []string{"//build/make/tools/otatools_package"},
+ },
+ )
+}