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

Use prebuilt_file for prebuilt_{etc,usr_share}

Browse Source 
Bug: 215723302
Test: TestPrebuiltEtcNoSubdir
Test: bp2build.sh
Test: mixed_{libc,droid}.sh
Change-Id: I006bfe12beb770e11153c52eddf34a6ec7f9e363
This commit is contained in:
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
2022-02-28 18:22:59 -05:00
parent b81f77ed24
commit c78604e6a4
2 changed files with 77 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
bp2build/prebuilt_etc_conversion_test.go
View File

@@ -49,7 +49,7 @@ prebuilt_etc {
"filename": `"tz_version"`,
"installable": `False`,
"src": `"version/tz_version"`,
"sub_dir": `"tz"`,
"dir": `"etc/tz"`,
})}})
}
@@ -83,7 +83,7 @@ prebuilt_etc {
"//build/bazel/platforms/arch:arm64": "arm64",
"//conditions:default": "version/tz_version",
})`,
"sub_dir": `"tz"`,
"dir": `"etc/tz"`,
})}})
}
@@ -125,6 +125,59 @@ prebuilt_etc {
"//build/bazel/platforms/os_arch:linux_bionic_arm64": "darwin_or_arm64",
"//conditions:default": "version/tz_version",
})`,
"sub_dir": `"tz"`,
"dir": `"etc/tz"`,
})}})
}
func runPrebuiltUsrShareTestCase(t *testing.T, tc bp2buildTestCase) {
t.Helper()
(&tc).moduleTypeUnderTest = "prebuilt_usr_share"
(&tc).moduleTypeUnderTestFactory = etc.PrebuiltUserShareFactory
runBp2BuildTestCase(t, registerPrebuiltEtcModuleTypes, tc)
}
func registerPrebuiltUsrShareModuleTypes(ctx android.RegistrationContext) {
}
func TestPrebuiltUsrShareSimple(t *testing.T) {
runPrebuiltUsrShareTestCase(t, bp2buildTestCase{
description: "prebuilt_usr_share - simple example",
filesystem: map[string]string{},
blueprint: `
prebuilt_usr_share {
name: "apex_tz_version",
src: "version/tz_version",
filename: "tz_version",
sub_dir: "tz",
installable: false,
}
`,
expectedBazelTargets: []string{
makeBazelTarget("prebuilt_file", "apex_tz_version", attrNameToString{
"filename": `"tz_version"`,
"installable": `False`,
"src": `"version/tz_version"`,
"dir": `"usr/share/tz"`,
})}})
}
func TestPrebuiltEtcNoSubdir(t *testing.T) {
runPrebuiltEtcTestCase(t, bp2buildTestCase{
description: "prebuilt_etc - no subdir",
filesystem: map[string]string{},
blueprint: `
prebuilt_etc {
name: "apex_tz_version",
src: "version/tz_version",
filename: "tz_version",
installable: false,
}
`,
expectedBazelTargets: []string{
makeBazelTarget("prebuilt_file", "apex_tz_version", attrNameToString{
"filename": `"tz_version"`,
"installable": `False`,
"src": `"version/tz_version"`,
"dir": `"etc"`,
})}})
}