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

Merge "Remove creation of has_stubs in cc_library_shared by bp2build" am: 72e1d65f05

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

Change-Id: Ie842303e1c838bc178031c619150059bc2047401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vinh Tran
2022-12-21 04:12:07 +00:00
committed by Automerger Merge Worker
parent b6cb07e712 72e1d65f05
commit 06a7174dc1
3 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bp2build/cc_library_conversion_test.go
View File

@@ -1409,7 +1409,6 @@ func makeCcLibraryTargets(name string, attrs AttrNameToString) []string {
"linkopts": true,
"strip": true,
"inject_bssl_hash": true,
"has_stubs": true,
"stubs_symbol_file": true,
"use_version_lib": true,
}
@@ -2712,7 +2711,6 @@ func TestCcLibraryStaticDisabledForSomeArch(t *testing.T) {
func TestCcLibraryStubs(t *testing.T) {
expectedBazelTargets := makeCcLibraryTargets("a", AttrNameToString{
"has_stubs": `True`,
"stubs_symbol_file": `"a.map.txt"`,
})
expectedBazelTargets = append(expectedBazelTargets, makeCcStubSuiteTargets("a", AttrNameToString{

1
bp2build/cc_library_shared_conversion_test.go
View File

@@ -543,7 +543,6 @@ cc_library_shared {
]`,
}),
MakeBazelTarget("cc_library_shared", "a", AttrNameToString{
"has_stubs": `True`,
"stubs_symbol_file": `"a.map.txt"`,
}),
},

5
cc/library.go
View File

@@ -424,8 +424,6 @@ func libraryBp2Build(ctx android.TopDownMutatorContext, m *Module) {
}
if compilerAttrs.stubsSymbolFile != nil && len(compilerAttrs.stubsVersions.Value) > 0 {
hasStubs := true
sharedTargetAttrs.Has_stubs.SetValue(&hasStubs)
sharedTargetAttrs.Stubs_symbol_file = compilerAttrs.stubsSymbolFile
}
@@ -2939,8 +2937,6 @@ func sharedOrStaticLibraryBp2Build(ctx android.TopDownMutatorContext, module *Mo
Fdo_profile: compilerAttrs.fdoProfile,
}
if compilerAttrs.stubsSymbolFile != nil && len(compilerAttrs.stubsVersions.Value) > 0 {
hasStubs := true
sharedLibAttrs.Has_stubs.SetValue(&hasStubs)
sharedLibAttrs.Stubs_symbol_file = compilerAttrs.stubsSymbolFile
}
attrs = sharedLibAttrs
@@ -3026,7 +3022,6 @@ type bazelCcLibrarySharedAttributes struct {
Features bazel.StringListAttribute
Has_stubs bazel.BoolAttribute
Stubs_symbol_file *string
Inject_bssl_hash bazel.BoolAttribute