StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Improve error reporting when depending on prebuilt implementation jar"

Browse Source 
This reverts commit c61783b20d.

Bug: 257969510
Reason for revert: b/255275437 - breaks checkbuild target

Change-Id: I01f88053cc24dbc1a4eb5c009f15473bdff3d565
This commit is contained in:
Paul Duffin
2022-11-21 10:57:30 +00:00
committed by Gerrit Code Review
parent c61783b20d
commit 7ed6ff8c76
7 changed files with 72 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
sdk/update.go
View File

@@ -1049,6 +1049,9 @@ type snapshotBuilder struct {
filesToZip android.Paths
zipsToMerge android.Paths
// The path to an empty file.
emptyFile android.WritablePath
prebuiltModules map[string]*bpModule
prebuiltOrder []*bpModule
@@ -1108,6 +1111,19 @@ func (s *snapshotBuilder) UnzipToSnapshot(zipPath android.Path, destDir string)
s.zipsToMerge = append(s.zipsToMerge, tmpZipPath)
}
func (s *snapshotBuilder) EmptyFile() android.Path {
if s.emptyFile == nil {
ctx := s.ctx
s.emptyFile = android.PathForModuleOut(ctx, "empty")
s.ctx.Build(pctx, android.BuildParams{
Rule: android.Touch,
Output: s.emptyFile,
})
}
return s.emptyFile
}
func (s *snapshotBuilder) AddPrebuiltModule(member android.SdkMember, moduleType string) android.BpModule {
name := member.Name()
if s.prebuiltModules[name] != nil {
@@ -1184,24 +1200,6 @@ func (s *snapshotBuilder) AddPrebuiltModule(member android.SdkMember, moduleType
return m
}
func (s *snapshotBuilder) AddInternalModule(properties android.SdkMemberProperties, moduleType string, nameSuffix string) android.BpModule {
name := properties.Name() + "-" + nameSuffix
if s.prebuiltModules[name] != nil {
panic(fmt.Sprintf("Duplicate module detected, module %s has already been added", name))
}
m := s.bpFile.newModule(moduleType)
m.AddProperty("name", name)
m.AddProperty("visibility", []string{"//visibility:private"})
s.prebuiltModules[name] = m
s.prebuiltOrder = append(s.prebuiltOrder, m)
s.allMembersByName[name] = struct{}{}
return m
}
func addHostDeviceSupportedProperties(deviceSupported bool, hostSupported bool, bpModule *bpModule) {
// If neither device or host is supported then this module does not support either so will not
// recognize the properties.
@@ -1232,23 +1230,18 @@ func (s *snapshotBuilder) OptionalSdkMemberReferencePropertyTag() android.BpProp
// Get a name for sdk snapshot member. If the member is private then generate a snapshot specific
// name. As part of the processing this checks to make sure that any required members are part of
// the snapshot.
func (s *snapshotBuilder) snapshotSdkMemberName(reference string, required bool) string {
prefix := ""
name := strings.TrimPrefix(reference, ":")
if name != reference {
prefix = ":"
}
func (s *snapshotBuilder) snapshotSdkMemberName(name string, required bool) string {
if _, ok := s.allMembersByName[name]; !ok {
if required {
s.ctx.ModuleErrorf("Required member reference %s is not a member of the sdk", name)
}
return reference
return name
}
if s.isInternalMember(name) {
return prefix + s.ctx.ModuleName() + "_" + name
return s.ctx.ModuleName() + "_" + name
} else {
return reference
return name
}
}
@@ -2064,7 +2057,6 @@ func (s *sdk) createMemberSnapshot(ctx *memberContext, member *sdkMember, bpModu
variantPropertiesFactory := func() android.SdkMemberProperties {
properties := memberType.CreateVariantPropertiesStruct()
base := properties.Base()
base.MemberName = member.Name()
base.Os_count = osCount
return properties
}