From 2b376bca0044c6a117834d592f61eb8ab33ee437 Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Wed, 12 Jan 2022 12:00:49 -0500 Subject: [PATCH] Create subdir for cc rules. Test: mixed_libc.sh Change-Id: I7f43f283f40ad6236dcedfccae175a007ea252d2 --- cc/binary.go | 2 +- cc/library.go | 8 ++++---- cc/library_headers.go | 2 +- cc/object.go | 2 +- cc/prebuilt.go | 4 ++-- cc/proto.go | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cc/binary.go b/cc/binary.go index ee3de3f5a..22a403d24 100644 --- a/cc/binary.go +++ b/cc/binary.go @@ -614,7 +614,7 @@ func binaryBp2build(ctx android.TopDownMutatorContext, m *Module, typ string) { ctx.CreateBazelTargetModuleWithRestrictions(bazel.BazelTargetModuleProperties{ 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()}, attrs, diff --git a/cc/library.go b/cc/library.go index cefbf6c44..a9d9bf44f 100644 --- a/cc/library.go +++ b/cc/library.go @@ -32,7 +32,7 @@ import ( "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 { // local file name to pass to the linker as -unexported_symbols_list Unexported_symbols_list *string `android:"path,arch_variant"` @@ -388,11 +388,11 @@ func libraryBp2Build(ctx android.TopDownMutatorContext, m *Module) { staticProps := bazel.BazelTargetModuleProperties{ 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{ 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, @@ -2535,7 +2535,7 @@ func sharedOrStaticLibraryBp2Build(ctx android.TopDownMutatorContext, module *Mo } props := bazel.BazelTargetModuleProperties{ 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) diff --git a/cc/library_headers.go b/cc/library_headers.go index 064e2b807..5d38fba03 100644 --- a/cc/library_headers.go +++ b/cc/library_headers.go @@ -136,7 +136,7 @@ func libraryHeadersBp2Build(ctx android.TopDownMutatorContext, module *Module) { props := bazel.BazelTargetModuleProperties{ 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) diff --git a/cc/object.go b/cc/object.go index 24f6ed455..fdd0b113c 100644 --- a/cc/object.go +++ b/cc/object.go @@ -195,7 +195,7 @@ func objectBp2Build(ctx android.TopDownMutatorContext, m *Module) { props := bazel.BazelTargetModuleProperties{ 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) diff --git a/cc/prebuilt.go b/cc/prebuilt.go index c928ed960..339a16d9d 100644 --- a/cc/prebuilt.go +++ b/cc/prebuilt.go @@ -339,7 +339,7 @@ func prebuiltLibraryStaticBp2Build(ctx android.TopDownMutatorContext, module *Mo props := bazel.BazelTargetModuleProperties{ 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()) @@ -359,7 +359,7 @@ func prebuiltLibrarySharedBp2Build(ctx android.TopDownMutatorContext, module *Mo props := bazel.BazelTargetModuleProperties{ 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()) diff --git a/cc/proto.go b/cc/proto.go index f3410bc2b..3cf1453c8 100644 --- a/cc/proto.go +++ b/cc/proto.go @@ -210,7 +210,7 @@ func bp2buildProto(ctx android.Bp2buildMutatorContext, m *Module, protoSrcs baze ctx.CreateBazelTargetModule( bazel.BazelTargetModuleProperties{ 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}, &protoAttrs)