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

Merge "Pass pointer to dependencyTag instead of copying struct" am: 4dd76eb26c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2096446

Change-Id: I8c4217c56e3d11f3d39780931dd6603dc0770b9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Paul Duffin
2022-05-13 22:20:53 +00:00
committed by Automerger Merge Worker
parent 1bf08694c8 4dd76eb26c
commit fe844bb3f8
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
apex/apex.go
View File

@@ -608,30 +608,34 @@ type dependencyTag struct {
sourceOnly bool sourceOnly bool
} }
func (d dependencyTag) ReplaceSourceWithPrebuilt() bool { func (d *dependencyTag) String() string {
return fmt.Sprintf("apex.dependencyTag{%q}", d.name)
}
func (d *dependencyTag) ReplaceSourceWithPrebuilt() bool {
return !d.sourceOnly return !d.sourceOnly
} }
var _ android.ReplaceSourceWithPrebuilt = &dependencyTag{} var _ android.ReplaceSourceWithPrebuilt = &dependencyTag{}
var ( var (
androidAppTag = dependencyTag{name: "androidApp", payload: true} androidAppTag = &dependencyTag{name: "androidApp", payload: true}
bpfTag = dependencyTag{name: "bpf", payload: true} bpfTag = &dependencyTag{name: "bpf", payload: true}
certificateTag = dependencyTag{name: "certificate"} certificateTag = &dependencyTag{name: "certificate"}
executableTag = dependencyTag{name: "executable", payload: true} executableTag = &dependencyTag{name: "executable", payload: true}
fsTag = dependencyTag{name: "filesystem", payload: true} fsTag = &dependencyTag{name: "filesystem", payload: true}
bcpfTag = dependencyTag{name: "bootclasspathFragment", payload: true, sourceOnly: true} bcpfTag = &dependencyTag{name: "bootclasspathFragment", payload: true, sourceOnly: true}
sscpfTag = dependencyTag{name: "systemserverclasspathFragment", payload: true, sourceOnly: true} sscpfTag = &dependencyTag{name: "systemserverclasspathFragment", payload: true, sourceOnly: true}
compatConfigTag = dependencyTag{name: "compatConfig", payload: true, sourceOnly: true} compatConfigTag = &dependencyTag{name: "compatConfig", payload: true, sourceOnly: true}
javaLibTag = dependencyTag{name: "javaLib", payload: true} javaLibTag = &dependencyTag{name: "javaLib", payload: true}
jniLibTag = dependencyTag{name: "jniLib", payload: true} jniLibTag = &dependencyTag{name: "jniLib", payload: true}
keyTag = dependencyTag{name: "key"} keyTag = &dependencyTag{name: "key"}
prebuiltTag = dependencyTag{name: "prebuilt", payload: true} prebuiltTag = &dependencyTag{name: "prebuilt", payload: true}
rroTag = dependencyTag{name: "rro", payload: true} rroTag = &dependencyTag{name: "rro", payload: true}
sharedLibTag = dependencyTag{name: "sharedLib", payload: true} sharedLibTag = &dependencyTag{name: "sharedLib", payload: true}
testForTag = dependencyTag{name: "test for"} testForTag = &dependencyTag{name: "test for"}
testTag = dependencyTag{name: "test", payload: true} testTag = &dependencyTag{name: "test", payload: true}
shBinaryTag = dependencyTag{name: "shBinary", payload: true} shBinaryTag = &dependencyTag{name: "shBinary", payload: true}
) )
// TODO(jiyong): shorten this function signature // TODO(jiyong): shorten this function signature
@@ -1752,7 +1756,7 @@ func (a *apexBundle) WalkPayloadDeps(ctx android.ModuleContext, do android.Paylo
if _, ok := depTag.(android.ExcludeFromApexContentsTag); ok { if _, ok := depTag.(android.ExcludeFromApexContentsTag); ok {
return false return false
} }
if dt, ok := depTag.(dependencyTag); ok && !dt.payload { if dt, ok := depTag.(*dependencyTag); ok && !dt.payload {
return false return false
} }

2
apex/apex_test.go
View File

@@ -5931,7 +5931,7 @@ func TestApexAvailable_DirectDep(t *testing.T) {
func TestApexAvailable_IndirectDep(t *testing.T) { func TestApexAvailable_IndirectDep(t *testing.T) {
// libbbaz is an indirect dep // libbbaz is an indirect dep
testApexError(t, `requires "libbaz" that doesn't list the APEX under 'apex_available'.\n\nDependency path: testApexError(t, `requires "libbaz" that doesn't list the APEX under 'apex_available'.\n\nDependency path:
.*via tag apex\.dependencyTag.*name:sharedLib.* .*via tag apex\.dependencyTag\{"sharedLib"\}
.*-> libfoo.*link:shared.* .*-> libfoo.*link:shared.*
.*via tag cc\.libraryDependencyTag.*Kind:sharedLibraryDependency.* .*via tag cc\.libraryDependencyTag.*Kind:sharedLibraryDependency.*
.*-> libbar.*link:shared.* .*-> libbar.*link:shared.*