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

Dedup cc binary build components registration

Browse Source 
Bug: 146540677
Test: m nothing

Change-Id: I1c677d0ee2cead1d61f81e34e8d5a2f4a52f6cad
This commit is contained in:
Paul Duffin
2020-01-16 12:14:42 +00:00
parent 8122cf6d09
commit 2ee6979443
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apex/apex_test.go
View File

@@ -288,7 +288,6 @@ func testApexContext(t *testing.T, bp string, handlers ...testCustomizer) (*andr
ctx.RegisterModuleType("override_apex", overrideApexFactory) ctx.RegisterModuleType("override_apex", overrideApexFactory)
cc.RegisterRequiredBuildComponentsForTest(ctx) cc.RegisterRequiredBuildComponentsForTest(ctx)
ctx.RegisterModuleType("cc_binary", cc.BinaryFactory)
ctx.RegisterModuleType("cc_test", cc.TestFactory) ctx.RegisterModuleType("cc_test", cc.TestFactory)
ctx.RegisterModuleType("vndk_prebuilt_shared", cc.VndkPrebuiltSharedFactory) ctx.RegisterModuleType("vndk_prebuilt_shared", cc.VndkPrebuiltSharedFactory)
ctx.RegisterModuleType("vndk_libraries_txt", cc.VndkLibrariesTxtFactory) ctx.RegisterModuleType("vndk_libraries_txt", cc.VndkLibrariesTxtFactory)

8
cc/binary.go
View File

@@ -56,8 +56,12 @@ type BinaryLinkerProperties struct {
} }
func init() { func init() {
android.RegisterModuleType("cc_binary", BinaryFactory) RegisterBinaryBuildComponents(android.InitRegistrationContext)
android.RegisterModuleType("cc_binary_host", binaryHostFactory) }
func RegisterBinaryBuildComponents(ctx android.RegistrationContext) {
ctx.RegisterModuleType("cc_binary", BinaryFactory)
ctx.RegisterModuleType("cc_binary_host", binaryHostFactory)
} }
// cc_binary produces a binary that is runnable on a device. // cc_binary produces a binary that is runnable on a device.

3
cc/testing.go
View File

@@ -23,6 +23,7 @@ func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) {
android.RegisterPrebuiltMutators(ctx) android.RegisterPrebuiltMutators(ctx)
RegisterCCBuildComponents(ctx) RegisterCCBuildComponents(ctx)
RegisterBinaryBuildComponents(ctx)
RegisterLibraryBuildComponents(ctx) RegisterLibraryBuildComponents(ctx)
ctx.RegisterModuleType("toolchain_library", ToolchainLibraryFactory) ctx.RegisterModuleType("toolchain_library", ToolchainLibraryFactory)
@@ -305,8 +306,6 @@ func TestConfig(buildDir string, os android.OsType, env map[string]string,
func CreateTestContext() *android.TestContext { func CreateTestContext() *android.TestContext {
ctx := android.NewTestArchContext() ctx := android.NewTestArchContext()
ctx.RegisterModuleType("cc_binary", BinaryFactory)
ctx.RegisterModuleType("cc_binary_host", binaryHostFactory)
ctx.RegisterModuleType("cc_fuzz", FuzzFactory) ctx.RegisterModuleType("cc_fuzz", FuzzFactory)
ctx.RegisterModuleType("cc_test", TestFactory) ctx.RegisterModuleType("cc_test", TestFactory)
ctx.RegisterModuleType("llndk_headers", llndkHeadersFactory) ctx.RegisterModuleType("llndk_headers", llndkHeadersFactory)