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

Commit 975a3b7f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update locations of apex bzl files" am: a704eb14 am: 1873bb0b am:... 

Merge "Update locations of apex bzl files" am: a704eb14 am: 1873bb0b am: 38d74297 am: 0e26d9c7

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



Change-Id: Ia052918c3834be03ca4de00f6ee3520dc09e3fa9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9a6b6a58 0e26d9c7

apex/apex.go

+1 −1
Original line number Original line Diff line number Diff line
@@ -3231,7 +3231,7 @@ func (a *apexBundle) ConvertWithBp2build(ctx android.TopDownMutatorContext) { 




	props := bazel.BazelTargetModuleProperties{

	props := bazel.BazelTargetModuleProperties{

		Rule_class:        "apex",

		Rule_class:        "apex",

		Bzl_load_location: "//build/bazel/rules:apex.bzl",

		Bzl_load_location: "//build/bazel/rules/apex:apex.bzl",

	}

	}





	ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: a.Name()}, attrs)

	ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: a.Name()}, attrs)

apex/key.go

+1 −1
Original line number Original line Diff line number Diff line
@@ -230,7 +230,7 @@ func apexKeyBp2BuildInternal(ctx android.TopDownMutatorContext, module *apexKey) 




	props := bazel.BazelTargetModuleProperties{

	props := bazel.BazelTargetModuleProperties{

		Rule_class:        "apex_key",

		Rule_class:        "apex_key",

		Bzl_load_location: "//build/bazel/rules:apex_key.bzl",

		Bzl_load_location: "//build/bazel/rules/apex:apex_key.bzl",

	}

	}





	ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: module.Name()}, attrs)

	ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: module.Name()}, attrs)