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
diff --git a/apex/Android.bp b/apex/Android.bp
index b9b5428..6269757 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -9,7 +9,6 @@
"blueprint",
"soong",
"soong-android",
- "soong-bazel",
"soong-bpf",
"soong-cc",
"soong-filesystem",
diff --git a/apex/apex.go b/apex/apex.go
index 11df288..baaf874 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -27,7 +27,6 @@
"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 @@
ctx.PreArchMutators(registerPreArchMutators)
ctx.PreDepsMutators(RegisterPreDepsMutators)
ctx.PostDepsMutators(RegisterPostDepsMutators)
-
- android.RegisterBp2BuildMutator("apex", ApexBundleBp2Build)
}
func registerPreArchMutators(ctx android.RegisterMutatorsContext) {
@@ -330,7 +327,6 @@
android.DefaultableModuleBase
android.OverridableModuleBase
android.SdkBase
- android.BazelModuleBase
// Properties
properties apexBundleProperties
@@ -3182,63 +3178,3 @@
},
}
}
-
-// 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) {}
diff --git a/bp2build/Android.bp b/bp2build/Android.bp
index dded14b..0e6030e 100644
--- a/bp2build/Android.bp
+++ b/bp2build/Android.bp
@@ -19,7 +19,6 @@
],
deps: [
"soong-android",
- "soong-apex",
"soong-bazel",
"soong-cc",
"soong-cc-config",
@@ -28,7 +27,6 @@
"soong-sh",
],
testSrcs: [
- "apex_conversion_test.go",
"build_conversion_test.go",
"bzl_conversion_test.go",
"cc_library_conversion_test.go",
diff --git a/bp2build/apex_conversion_test.go b/bp2build/apex_conversion_test.go
deleted file mode 100644
index fbf6fa2..0000000
--- a/bp2build/apex_conversion_test.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2021 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package bp2build
-
-import (
- "android/soong/android"
- "android/soong/apex"
- "testing"
-)
-
-func runApexTestCase(t *testing.T, tc bp2buildTestCase) {
- t.Helper()
- runBp2BuildTestCase(t, registerApexModuleTypes, tc)
-}
-
-func registerApexModuleTypes(ctx android.RegistrationContext) {
-}
-
-func TestApexBundleSimple(t *testing.T) {
- runApexTestCase(t, bp2buildTestCase{
- description: "apex - simple example",
- moduleTypeUnderTest: "apex",
- moduleTypeUnderTestFactory: apex.BundleFactory,
- moduleTypeUnderTestBp2BuildMutator: apex.ApexBundleBp2Build,
- filesystem: map[string]string{},
- blueprint: `
-apex {
- name: "apogee",
- manifest: "manifest.json",
-}
-`,
- expectedBazelTargets: []string{`apex(
- name = "apogee",
- manifest = "manifest.json",
-)`}})
-}