Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b376bca authored by Liz Kammer's avatar Liz Kammer
Browse files

Create subdir for cc rules. 

Test: mixed_libc.sh
Change-Id: I7f43f283f40ad6236dcedfccae175a007ea252d2
parent a86875ee

cc/binary.go

+1 −1
Original line number Diff line number Diff line
@@ -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,

cc/library.go

+4 −4
Original line number Diff line number Diff line
@@ -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)

cc/library_headers.go

+1 −1
Original line number Diff line number Diff line
@@ -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)

cc/object.go

+1 −1
Original line number Diff line number Diff line
@@ -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)

cc/prebuilt.go

+2 −2
Original line number Diff line number Diff line
@@ -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())