StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use prebuilt_etc for prebuilt modules in bp2build test, instead of

Browse Source 
pretending with a cc_library.

Test: CI
Change-Id: Ib9a081670e072a0e7378289f677063a978d0a62d
This commit is contained in:
Jingwen Chen
2022-06-08 16:08:25 +00:00
parent df165c9e85
commit 81c67d3904
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
bp2build/apex_conversion_test.go
View File

@@ -40,6 +40,7 @@ func registerApexModuleTypes(ctx android.RegistrationContext) {
ctx.RegisterModuleType("apex_key", apex.ApexKeyFactory) ctx.RegisterModuleType("apex_key", apex.ApexKeyFactory)
ctx.RegisterModuleType("android_app_certificate", java.AndroidAppCertificateFactory) ctx.RegisterModuleType("android_app_certificate", java.AndroidAppCertificateFactory)
ctx.RegisterModuleType("filegroup", android.FileGroupFactory) ctx.RegisterModuleType("filegroup", android.FileGroupFactory)
ctx.RegisterModuleType("prebuilt_etc", etc.PrebuiltEtcFactory)
} }
func runOverrideApexTestCase(t *testing.T, tc bp2buildTestCase) { func runOverrideApexTestCase(t *testing.T, tc bp2buildTestCase) {
@@ -91,13 +92,13 @@ cc_library {
bazel_module: { bp2build_available: false }, bazel_module: { bp2build_available: false },
} }
cc_library { prebuilt_etc {
name: "pretend_prebuilt_1", name: "prebuilt_1",
bazel_module: { bp2build_available: false }, bazel_module: { bp2build_available: false },
} }
cc_library { prebuilt_etc {
name: "pretend_prebuilt_2", name: "prebuilt_2",
bazel_module: { bp2build_available: false }, bazel_module: { bp2build_available: false },
} }
@@ -132,8 +133,8 @@ apex {
"sh_binary_2", "sh_binary_2",
], ],
prebuilts: [ prebuilts: [
"pretend_prebuilt_1", "prebuilt_1",
"pretend_prebuilt_2", "prebuilt_2",
], ],
package_name: "com.android.apogee.test.package", package_name: "com.android.apogee.test.package",
} }
@@ -167,8 +168,8 @@ apex {
"//conditions:default": [], "//conditions:default": [],
})`, })`,
"prebuilts": `[ "prebuilts": `[
":pretend_prebuilt_1", ":prebuilt_1",
":pretend_prebuilt_2", ":prebuilt_2",
]`, ]`,
"updatable": "False", "updatable": "False",
"compressible": "False", "compressible": "False",
@@ -551,13 +552,13 @@ cc_library {
bazel_module: { bp2build_available: false }, bazel_module: { bp2build_available: false },
} }
cc_library { prebuilt_etc {
name: "pretend_prebuilt_1", name: "prebuilt_1",
bazel_module: { bp2build_available: false }, bazel_module: { bp2build_available: false },
} }
cc_library { prebuilt_etc {
name: "pretend_prebuilt_2", name: "prebuilt_2",
bazel_module: { bp2build_available: false }, bazel_module: { bp2build_available: false },
} }
@@ -592,8 +593,8 @@ apex {
"sh_binary_2", "sh_binary_2",
], ],
prebuilts: [ prebuilts: [
"pretend_prebuilt_1", "prebuilt_1",
"pretend_prebuilt_2", "prebuilt_2",
], ],
bazel_module: { bp2build_available: false }, bazel_module: { bp2build_available: false },
} }