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

Create subdir for cc rules.

Browse Source 
Test: mixed_libc.sh
Change-Id: I7f43f283f40ad6236dcedfccae175a007ea252d2
This commit is contained in:
Liz Kammer
2022-01-12 12:00:49 -05:00
parent a86875eefb
commit 2b376bca00
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/binary.go
View File

@@ -614,7 +614,7 @@ func binaryBp2build(ctx android.TopDownMutatorContext, m *Module, typ string) {
ctx.CreateBazelTargetModuleWithRestrictions(bazel.BazelTargetModuleProperties{ ctx.CreateBazelTargetModuleWithRestrictions(bazel.BazelTargetModuleProperties{
Rule_class: "cc_binary", Rule_class: "cc_binary",
Bzl_load_location: "//build/bazel/rules:cc_binary.bzl", Bzl_load_location: "//build/bazel/rules/cc:cc_binary.bzl",
}, },
android.CommonAttributes{Name: m.Name()}, android.CommonAttributes{Name: m.Name()},
attrs, attrs,

8
cc/library.go
View File

@@ -32,7 +32,7 @@ import (
"github.com/google/blueprint/pathtools" "github.com/google/blueprint/pathtools"
) )
// LibraryProperties is a collection of properties shared by cc library rules. // LibraryProperties is a collection of properties shared by cc library rules/cc.
type LibraryProperties struct { type LibraryProperties struct {
// local file name to pass to the linker as -unexported_symbols_list // local file name to pass to the linker as -unexported_symbols_list
Unexported_symbols_list *string `android:"path,arch_variant"` Unexported_symbols_list *string `android:"path,arch_variant"`
@@ -388,11 +388,11 @@ func libraryBp2Build(ctx android.TopDownMutatorContext, m *Module) {
staticProps := bazel.BazelTargetModuleProperties{ staticProps := bazel.BazelTargetModuleProperties{
Rule_class: "cc_library_static", Rule_class: "cc_library_static",
Bzl_load_location: "//build/bazel/rules:cc_library_static.bzl", Bzl_load_location: "//build/bazel/rules/cc:cc_library_static.bzl",
} }
sharedProps := bazel.BazelTargetModuleProperties{ sharedProps := bazel.BazelTargetModuleProperties{
Rule_class: "cc_library_shared", Rule_class: "cc_library_shared",
Bzl_load_location: "//build/bazel/rules:cc_library_shared.bzl", Bzl_load_location: "//build/bazel/rules/cc:cc_library_shared.bzl",
} }
ctx.CreateBazelTargetModuleWithRestrictions(staticProps, ctx.CreateBazelTargetModuleWithRestrictions(staticProps,
@@ -2535,7 +2535,7 @@ func sharedOrStaticLibraryBp2Build(ctx android.TopDownMutatorContext, module *Mo
} }
props := bazel.BazelTargetModuleProperties{ props := bazel.BazelTargetModuleProperties{
Rule_class: modType, Rule_class: modType,
Bzl_load_location: fmt.Sprintf("//build/bazel/rules:%s.bzl", modType), Bzl_load_location: fmt.Sprintf("//build/bazel/rules/cc:%s.bzl", modType),
} }
ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: module.Name()}, attrs) ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: module.Name()}, attrs)

2
cc/library_headers.go
View File

@@ -136,7 +136,7 @@ func libraryHeadersBp2Build(ctx android.TopDownMutatorContext, module *Module) {
props := bazel.BazelTargetModuleProperties{ props := bazel.BazelTargetModuleProperties{
Rule_class: "cc_library_headers", Rule_class: "cc_library_headers",
Bzl_load_location: "//build/bazel/rules:cc_library_headers.bzl", Bzl_load_location: "//build/bazel/rules/cc:cc_library_headers.bzl",
} }
ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: module.Name()}, attrs) ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: module.Name()}, attrs)

2
cc/object.go
View File

@@ -195,7 +195,7 @@ func objectBp2Build(ctx android.TopDownMutatorContext, m *Module) {
props := bazel.BazelTargetModuleProperties{ props := bazel.BazelTargetModuleProperties{
Rule_class: "cc_object", Rule_class: "cc_object",
Bzl_load_location: "//build/bazel/rules:cc_object.bzl", Bzl_load_location: "//build/bazel/rules/cc:cc_object.bzl",
} }
ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: m.Name()}, attrs) ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: m.Name()}, attrs)

4
cc/prebuilt.go
View File

@@ -339,7 +339,7 @@ func prebuiltLibraryStaticBp2Build(ctx android.TopDownMutatorContext, module *Mo
props := bazel.BazelTargetModuleProperties{ props := bazel.BazelTargetModuleProperties{
Rule_class: "prebuilt_library_static", Rule_class: "prebuilt_library_static",
Bzl_load_location: "//build/bazel/rules:prebuilt_library_static.bzl", Bzl_load_location: "//build/bazel/rules/cc:prebuilt_library_static.bzl",
} }
name := android.RemoveOptionalPrebuiltPrefix(module.Name()) name := android.RemoveOptionalPrebuiltPrefix(module.Name())
@@ -359,7 +359,7 @@ func prebuiltLibrarySharedBp2Build(ctx android.TopDownMutatorContext, module *Mo
props := bazel.BazelTargetModuleProperties{ props := bazel.BazelTargetModuleProperties{
Rule_class: "prebuilt_library_shared", Rule_class: "prebuilt_library_shared",
Bzl_load_location: "//build/bazel/rules:prebuilt_library_shared.bzl", Bzl_load_location: "//build/bazel/rules/cc:prebuilt_library_shared.bzl",
} }
name := android.RemoveOptionalPrebuiltPrefix(module.Name()) name := android.RemoveOptionalPrebuiltPrefix(module.Name())

2
cc/proto.go
View File

@@ -210,7 +210,7 @@ func bp2buildProto(ctx android.Bp2buildMutatorContext, m *Module, protoSrcs baze
ctx.CreateBazelTargetModule( ctx.CreateBazelTargetModule(
bazel.BazelTargetModuleProperties{ bazel.BazelTargetModuleProperties{
Rule_class: rule_class, Rule_class: rule_class,
Bzl_load_location: "//build/bazel/rules:cc_proto.bzl", Bzl_load_location: "//build/bazel/rules/cc:cc_proto.bzl",
}, },
android.CommonAttributes{Name: name}, android.CommonAttributes{Name: name},
&protoAttrs) &protoAttrs)