Introduce BazelStringOrLabelFromProp.
Soong supports string properties, but they are overloaded, and can mean one of three things: * path reference * module reference * string literal Bazel has different types: label and string attributes. Thus there needs to be a way to categorize them correctly in bp2build. This CL introduces a new function to be used on properties like apex_key.private_key / apex_key.public_key, as well as android_app.certificate / apex.certificate. It is important to disambiguate the prop betenn a string literal attribute or file/rule target label attribute, so this functions does just that. The new attributes are then further handled by their respective macros (apex_key, android_binary, apex). Bug: 253557437 Fixes: 253557437 Test: presubmits, new tests Change-Id: Id8111cdd60d3aabcae7d17fe9da84d0ee3966023
This commit is contained in:
@@ -27,6 +27,7 @@ func runAndroidAppTestCase(t *testing.T, tc Bp2buildTestCase) {
|
||||
}
|
||||
|
||||
func registerAndroidAppModuleTypes(ctx android.RegistrationContext) {
|
||||
ctx.RegisterModuleType("filegroup", android.FileGroupFactory)
|
||||
}
|
||||
|
||||
func TestMinimalAndroidApp(t *testing.T) {
|
||||
@@ -76,6 +77,7 @@ android_app {
|
||||
manifest: "manifest/AndroidManifest.xml",
|
||||
static_libs: ["static_lib_dep"],
|
||||
java_version: "7",
|
||||
certificate: "foocert",
|
||||
}
|
||||
`,
|
||||
ExpectedBazelTargets: []string{
|
||||
@@ -86,9 +88,10 @@ android_app {
|
||||
"resa/res.png",
|
||||
"resb/res.png",
|
||||
]`,
|
||||
"custom_package": `"com.google"`,
|
||||
"deps": `[":static_lib_dep"]`,
|
||||
"javacopts": `["-source 1.7 -target 1.7"]`,
|
||||
"custom_package": `"com.google"`,
|
||||
"deps": `[":static_lib_dep"]`,
|
||||
"javacopts": `["-source 1.7 -target 1.7"]`,
|
||||
"certificate_name": `"foocert"`,
|
||||
}),
|
||||
}})
|
||||
}
|
||||
@@ -130,3 +133,70 @@ android_app {
|
||||
}),
|
||||
}})
|
||||
}
|
||||
|
||||
func TestAndroidAppCertIsModule(t *testing.T) {
|
||||
runAndroidAppTestCase(t, Bp2buildTestCase{
|
||||
Description: "Android app - cert is module",
|
||||
ModuleTypeUnderTest: "android_app",
|
||||
ModuleTypeUnderTestFactory: java.AndroidAppFactory,
|
||||
Filesystem: map[string]string{},
|
||||
Blueprint: simpleModuleDoNotConvertBp2build("filegroup", "foocert") + `
|
||||
android_app {
|
||||
name: "TestApp",
|
||||
certificate: ":foocert",
|
||||
}
|
||||
`,
|
||||
ExpectedBazelTargets: []string{
|
||||
MakeBazelTarget("android_binary", "TestApp", AttrNameToString{
|
||||
"certificate": `":foocert"`,
|
||||
"manifest": `"AndroidManifest.xml"`,
|
||||
"resource_files": `[]`,
|
||||
}),
|
||||
}})
|
||||
}
|
||||
|
||||
func TestAndroidAppCertIsSrcFile(t *testing.T) {
|
||||
runAndroidAppTestCase(t, Bp2buildTestCase{
|
||||
Description: "Android app - cert is src file",
|
||||
ModuleTypeUnderTest: "android_app",
|
||||
ModuleTypeUnderTestFactory: java.AndroidAppFactory,
|
||||
Filesystem: map[string]string{
|
||||
"foocert": "",
|
||||
},
|
||||
Blueprint: `
|
||||
android_app {
|
||||
name: "TestApp",
|
||||
certificate: "foocert",
|
||||
}
|
||||
`,
|
||||
ExpectedBazelTargets: []string{
|
||||
MakeBazelTarget("android_binary", "TestApp", AttrNameToString{
|
||||
"certificate": `"foocert"`,
|
||||
"manifest": `"AndroidManifest.xml"`,
|
||||
"resource_files": `[]`,
|
||||
}),
|
||||
}})
|
||||
}
|
||||
|
||||
func TestAndroidAppCertIsNotSrcOrModule(t *testing.T) {
|
||||
runAndroidAppTestCase(t, Bp2buildTestCase{
|
||||
Description: "Android app - cert is not src or module",
|
||||
ModuleTypeUnderTest: "android_app",
|
||||
ModuleTypeUnderTestFactory: java.AndroidAppFactory,
|
||||
Filesystem: map[string]string{
|
||||
// deliberate empty
|
||||
},
|
||||
Blueprint: `
|
||||
android_app {
|
||||
name: "TestApp",
|
||||
certificate: "foocert",
|
||||
}
|
||||
`,
|
||||
ExpectedBazelTargets: []string{
|
||||
MakeBazelTarget("android_binary", "TestApp", AttrNameToString{
|
||||
"certificate_name": `"foocert"`,
|
||||
"manifest": `"AndroidManifest.xml"`,
|
||||
"resource_files": `[]`,
|
||||
}),
|
||||
}})
|
||||
}
|
||||
|
Reference in New Issue
Block a user