Revert "Add some more properties to the bp2build APEX converter."
This reverts commit 69bf4c0d605c0c10cd0f1180ec7398732abc4364.
Reason for revert: Possibly broke CI (https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master-bazel&target=bp2build-incremental&lkgb=7266256&fkbb=7237028), rolling back just in case...
Change-Id: I14ebac4f47576a73285d1f724ae4499036e8e678
diff --git a/bp2build/apex_conversion_test.go b/bp2build/apex_conversion_test.go
index d38300e..f4a1016 100644
--- a/bp2build/apex_conversion_test.go
+++ b/bp2build/apex_conversion_test.go
@@ -17,9 +17,6 @@
import (
"android/soong/android"
"android/soong/apex"
- "android/soong/cc"
- "android/soong/java"
-
"testing"
)
@@ -29,13 +26,6 @@
}
func registerApexModuleTypes(ctx android.RegistrationContext) {
- // CC module types needed as they can be APEX dependencies viathe native_shared_libs property
- cc.RegisterCCBuildComponents(ctx)
- ctx.RegisterModuleType("cc_library", cc.LibraryFactory)
-
- ctx.RegisterModuleType("apex_key", apex.ApexKeyFactory)
-
- ctx.RegisterModuleType("android_app_certificate", java.AndroidAppCertificateFactory)
}
func TestApexBundleSimple(t *testing.T) {
@@ -46,67 +36,14 @@
moduleTypeUnderTestBp2BuildMutator: apex.ApexBundleBp2Build,
filesystem: map[string]string{},
blueprint: `
-apex_key {
- name: "com.android.apogee.key",
- public_key: "com.android.apogee.avbpubkey",
- private_key: "com.android.apogee.pem",
- bazel_module: { bp2build_available: false },
-}
-
-android_app_certificate {
- name: "com.android.apogee.certificate",
- certificate: "com.android.apogee",
- bazel_module: { bp2build_available: false },
-}
-
-cc_library {
- name: "native_shared_lib_1",
- bazel_module: { bp2build_available: false },
-}
-
-cc_library {
- name: "native_shared_lib_2",
- bazel_module: { bp2build_available: false },
-}
-
apex {
- name: "com.android.apogee",
- manifest: "apogee_manifest.json",
- androidManifest: "ApogeeAndroidManifest.xml",
- file_contexts: "com.android.apogee-file_contexts",
- min_sdk_version: "29",
- key: "com.android.apogee.key",
- certificate: "com.android.apogee.certificate",
- updatable: false,
- installable: false,
- native_shared_libs: [
- "native_shared_lib_1",
- "native_shared_lib_2",
- ],
- binaries: [
- "binary_1",
- "binary_2",
- ],
+ name: "apogee",
+ manifest: "manifest.json",
}
`,
expectedBazelTargets: []string{`apex(
- name = "com.android.apogee",
- android_manifest = "ApogeeAndroidManifest.xml",
- binaries = [
- "binary_1",
- "binary_2",
- ],
- certificate = ":com.android.apogee.certificate",
- file_contexts = "com.android.apogee-file_contexts",
- installable = False,
- key = ":com.android.apogee.key",
- manifest = "apogee_manifest.json",
- min_sdk_version = "29",
- native_shared_libs = [
- ":native_shared_lib_1",
- ":native_shared_lib_2",
- ],
- updatable = False,
+ name = "apogee",
+ manifest = "manifest.json",
)`}})
}