diff options
author | 2025-03-17 14:38:45 -0700 | |
---|---|---|
committer | 2025-03-17 14:38:45 -0700 | |
commit | 52b84c74d1ae2cb97d7a2ced29fb355a38b7c518 (patch) | |
tree | b6821159eb41c04a06c920eee5812eb8c9f35d4e | |
parent | 9771fadb6bc6fac80f1c70bc341976f227dfe79f (diff) |
Revert "Create the filegroup to collect cert files for otatools.zip"
Revert submission 3530575-otatools-package-temp
Reason for revert: b/403277238
Reverted changes: /q/submissionid:3530575-otatools-package-temp
Change-Id: I05967d33c2c70359a934cdfe9274a54ecff9b3ef
-rw-r--r-- | android/Android.bp | 4 | ||||
-rw-r--r-- | android/filegroup.go | 52 |
2 files changed, 0 insertions, 56 deletions
diff --git a/android/Android.bp b/android/Android.bp index 4b75148fc..00dc50ac2 100644 --- a/android/Android.bp +++ b/android/Android.bp @@ -171,7 +171,3 @@ bootstrap_go_package { // Used by plugins visibility: ["//visibility:public"], } - -otatools_package_filegroup { - name: "otatools_package_filegroup", -} diff --git a/android/filegroup.go b/android/filegroup.go index 9bcfd0a83..4fad52aaa 100644 --- a/android/filegroup.go +++ b/android/filegroup.go @@ -33,7 +33,6 @@ var PrepareForTestWithFilegroup = FixtureRegisterWithContext(func(ctx Registrati func RegisterFilegroupBuildComponents(ctx RegistrationContext) { ctx.RegisterModuleType("filegroup", FileGroupFactory) ctx.RegisterModuleType("filegroup_defaults", FileGroupDefaultsFactory) - ctx.RegisterModuleType("otatools_package_filegroup", OtatoolsFileGroupFactory) } type fileGroupProperties struct { @@ -164,54 +163,3 @@ func (fg *fileGroup) IDEInfo(ctx BaseModuleContext, dpInfo *IdeInfo) { } } } - -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"}, - }, - ) -} |