Revert "Add partial bp2build support for APEX targets."
Revert submission 1733232-roboleaf-apex Reason for revert: b/192523357 Broken build 7512065 on aosp-master on sdk_x86_64-sdk Reverted Changes: Ie82c263f6:Add a stub rule for building APEX bundles. I93e2a25fa:Add partial bp2build support for APEX targets. Change-Id: I8e836fe7f466e02f3108680f9653412299e929e0
This commit is contained in:
@@ -9,7 +9,6 @@ bootstrap_go_package {
|
||||
"blueprint",
|
||||
"soong",
|
||||
"soong-android",
|
||||
"soong-bazel",
|
||||
"soong-bpf",
|
||||
"soong-cc",
|
||||
"soong-filesystem",
|
||||
|
64
apex/apex.go
64
apex/apex.go
@@ -27,7 +27,6 @@ import (
|
||||
"github.com/google/blueprint/proptools"
|
||||
|
||||
"android/soong/android"
|
||||
"android/soong/bazel"
|
||||
"android/soong/bpf"
|
||||
"android/soong/cc"
|
||||
prebuilt_etc "android/soong/etc"
|
||||
@@ -54,8 +53,6 @@ func registerApexBuildComponents(ctx android.RegistrationContext) {
|
||||
ctx.PreArchMutators(registerPreArchMutators)
|
||||
ctx.PreDepsMutators(RegisterPreDepsMutators)
|
||||
ctx.PostDepsMutators(RegisterPostDepsMutators)
|
||||
|
||||
android.RegisterBp2BuildMutator("apex", ApexBundleBp2Build)
|
||||
}
|
||||
|
||||
func registerPreArchMutators(ctx android.RegisterMutatorsContext) {
|
||||
@@ -330,7 +327,6 @@ type apexBundle struct {
|
||||
android.DefaultableModuleBase
|
||||
android.OverridableModuleBase
|
||||
android.SdkBase
|
||||
android.BazelModuleBase
|
||||
|
||||
// Properties
|
||||
properties apexBundleProperties
|
||||
@@ -3182,63 +3178,3 @@ func rModulesPackages() map[string][]string {
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// For Bazel / bp2build
|
||||
|
||||
type bazelApexBundleAttributes struct {
|
||||
Manifest bazel.LabelAttribute
|
||||
}
|
||||
|
||||
type bazelApexBundle struct {
|
||||
android.BazelTargetModuleBase
|
||||
bazelApexBundleAttributes
|
||||
}
|
||||
|
||||
func BazelApexBundleFactory() android.Module {
|
||||
module := &bazelApexBundle{}
|
||||
module.AddProperties(&module.bazelApexBundleAttributes)
|
||||
android.InitBazelTargetModule(module)
|
||||
return module
|
||||
}
|
||||
|
||||
func ApexBundleBp2Build(ctx android.TopDownMutatorContext) {
|
||||
module, ok := ctx.Module().(*apexBundle)
|
||||
if !ok {
|
||||
// Not an APEX bundle
|
||||
return
|
||||
}
|
||||
if !module.ConvertWithBp2build(ctx) {
|
||||
return
|
||||
}
|
||||
if ctx.ModuleType() != "apex" {
|
||||
return
|
||||
}
|
||||
|
||||
apexBundleBp2BuildInternal(ctx, module)
|
||||
}
|
||||
|
||||
func apexBundleBp2BuildInternal(ctx android.TopDownMutatorContext, module *apexBundle) {
|
||||
var manifestLabelAttribute bazel.LabelAttribute
|
||||
|
||||
manifestStringPtr := module.properties.Manifest
|
||||
if module.properties.Manifest != nil {
|
||||
manifestLabelAttribute.SetValue(android.BazelLabelForModuleSrcSingle(ctx, *manifestStringPtr))
|
||||
}
|
||||
|
||||
attrs := &bazelApexBundleAttributes{
|
||||
Manifest: manifestLabelAttribute,
|
||||
}
|
||||
|
||||
props := bazel.BazelTargetModuleProperties{
|
||||
Rule_class: "apex",
|
||||
Bzl_load_location: "//build/bazel/rules:apex.bzl",
|
||||
}
|
||||
|
||||
ctx.CreateBazelTargetModule(BazelApexBundleFactory, module.Name(), props, attrs)
|
||||
}
|
||||
|
||||
func (m *bazelApexBundle) Name() string {
|
||||
return m.BaseModuleName()
|
||||
}
|
||||
|
||||
func (m *bazelApexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {}
|
||||
|
Reference in New Issue
Block a user