Rename vndk apex according to vndk version
VNDK APEX should be named after the version of VNDK libs. For example, if vndk_version is 29, then the apex name should be com.android.vndk.v29. If vndk_version is not set or is 'current', then the platform vndk version is implied. This is done with setting "apex_name" with proper name. Bug: 139774701 Test: m (soong test added) Change-Id: I918252f12ccd351886030fe9139a020d6cf1ff32
This commit is contained in:
@@ -1441,6 +1441,37 @@ func TestVndkApexErrorWithDuplicateVersion(t *testing.T) {
|
||||
}))
|
||||
}
|
||||
|
||||
func TestVndkApexNameRule(t *testing.T) {
|
||||
ctx, _ := testApex(t, `
|
||||
apex_vndk {
|
||||
name: "myapex",
|
||||
key: "myapex.key",
|
||||
file_contexts: "myapex",
|
||||
}
|
||||
apex_vndk {
|
||||
name: "myapex_v28",
|
||||
key: "myapex.key",
|
||||
file_contexts: "myapex",
|
||||
vndk_version: "28",
|
||||
}
|
||||
apex_key {
|
||||
name: "myapex.key",
|
||||
public_key: "testkey.avbpubkey",
|
||||
private_key: "testkey.pem",
|
||||
}`)
|
||||
|
||||
assertApexName := func(expected, moduleName string) {
|
||||
bundle := ctx.ModuleForTests(moduleName, "android_common_"+moduleName).Module().(*apexBundle)
|
||||
actual := proptools.String(bundle.properties.Apex_name)
|
||||
if !reflect.DeepEqual(actual, expected) {
|
||||
t.Errorf("Got '%v', expected '%v'", actual, expected)
|
||||
}
|
||||
}
|
||||
|
||||
assertApexName("com.android.vndk.vVER", "myapex")
|
||||
assertApexName("com.android.vndk.v28", "myapex_v28")
|
||||
}
|
||||
|
||||
func TestVndkApexSkipsNativeBridgeSupportedModules(t *testing.T) {
|
||||
ctx, _ := testApex(t, `
|
||||
apex_vndk {
|
||||
|
Reference in New Issue
Block a user