Merge changes Icbdf4979,I1a6f135d
* changes: Fix apex to override certificate Fix apex to follow deps of modules with stubs.
This commit is contained in:
@@ -228,6 +228,14 @@ func UpdateApexDependency(apexName string, moduleName string, directDep bool) {
|
||||
apexNames[apexName] = apexNames[apexName] || directDep
|
||||
}
|
||||
|
||||
// TODO(b/146393795): remove this when b/146393795 is fixed
|
||||
func ClearApexDependency() {
|
||||
m := apexNamesMap()
|
||||
for k := range m {
|
||||
delete(m, k)
|
||||
}
|
||||
}
|
||||
|
||||
// Tests whether a module named moduleName is directly depended on by an APEX
|
||||
// named apexName.
|
||||
func DirectlyInApex(apexName string, moduleName string) bool {
|
||||
|
@@ -1095,7 +1095,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
// don't include it in this APEX
|
||||
return false
|
||||
}
|
||||
if !a.Host() && (cc.IsStubs() || cc.HasStubsVariants()) {
|
||||
if !a.Host() && !android.DirectlyInApex(ctx.ModuleName(), ctx.OtherModuleName(cc)) && (cc.IsStubs() || cc.HasStubsVariants()) {
|
||||
// If the dependency is a stubs lib, don't include it in this APEX,
|
||||
// but make sure that the lib is installed on the device.
|
||||
// In case no APEX is having the lib, the lib is installed to the system
|
||||
|
@@ -92,6 +92,7 @@ func withBinder32bit(fs map[string][]byte, config android.Config) {
|
||||
}
|
||||
|
||||
func testApexContext(t *testing.T, bp string, handlers ...testCustomizer) (*android.TestContext, android.Config) {
|
||||
android.ClearApexDependency()
|
||||
config := android.TestArchConfig(buildDir, nil)
|
||||
config.TestProductVariables.DeviceVndkVersion = proptools.StringPtr("current")
|
||||
config.TestProductVariables.DefaultAppCertificate = proptools.StringPtr("vendor/foo/devkeys/test")
|
||||
@@ -739,6 +740,12 @@ func TestApexWithStubs(t *testing.T) {
|
||||
|
||||
// Ensure that genstub is invoked with --apex
|
||||
ensureContains(t, "--apex", ctx.ModuleForTests("mylib2", "android_arm64_armv8-a_static_3_myapex").Rule("genStubSrc").Args["flags"])
|
||||
|
||||
ensureExactContents(t, ctx, "myapex", []string{
|
||||
"lib64/mylib.so",
|
||||
"lib64/mylib3.so",
|
||||
"lib64/mylib4.so",
|
||||
})
|
||||
}
|
||||
|
||||
func TestApexWithExplicitStubsDependency(t *testing.T) {
|
||||
@@ -1312,6 +1319,134 @@ func TestKeys(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestCertificate(t *testing.T) {
|
||||
t.Run("if unspecified, it defaults to DefaultAppCertificate", func(t *testing.T) {
|
||||
ctx, _ := testApex(t, `
|
||||
apex {
|
||||
name: "myapex",
|
||||
key: "myapex.key",
|
||||
}
|
||||
apex_key {
|
||||
name: "myapex.key",
|
||||
public_key: "testkey.avbpubkey",
|
||||
private_key: "testkey.pem",
|
||||
}`)
|
||||
rule := ctx.ModuleForTests("myapex", "android_common_myapex_image").Rule("signapk")
|
||||
expected := "vendor/foo/devkeys/test.x509.pem vendor/foo/devkeys/test.pk8"
|
||||
if actual := rule.Args["certificates"]; actual != expected {
|
||||
t.Errorf("certificates should be %q, not %q", expected, actual)
|
||||
}
|
||||
})
|
||||
t.Run("override when unspecified", func(t *testing.T) {
|
||||
ctx, _ := testApex(t, `
|
||||
apex {
|
||||
name: "myapex_keytest",
|
||||
key: "myapex.key",
|
||||
file_contexts: ":myapex-file_contexts",
|
||||
}
|
||||
apex_key {
|
||||
name: "myapex.key",
|
||||
public_key: "testkey.avbpubkey",
|
||||
private_key: "testkey.pem",
|
||||
}
|
||||
android_app_certificate {
|
||||
name: "myapex.certificate.override",
|
||||
certificate: "testkey.override",
|
||||
}`)
|
||||
rule := ctx.ModuleForTests("myapex_keytest", "android_common_myapex_keytest_image").Rule("signapk")
|
||||
expected := "testkey.override.x509.pem testkey.override.pk8"
|
||||
if actual := rule.Args["certificates"]; actual != expected {
|
||||
t.Errorf("certificates should be %q, not %q", expected, actual)
|
||||
}
|
||||
})
|
||||
t.Run("if specified as :module, it respects the prop", func(t *testing.T) {
|
||||
ctx, _ := testApex(t, `
|
||||
apex {
|
||||
name: "myapex",
|
||||
key: "myapex.key",
|
||||
certificate: ":myapex.certificate",
|
||||
}
|
||||
apex_key {
|
||||
name: "myapex.key",
|
||||
public_key: "testkey.avbpubkey",
|
||||
private_key: "testkey.pem",
|
||||
}
|
||||
android_app_certificate {
|
||||
name: "myapex.certificate",
|
||||
certificate: "testkey",
|
||||
}`)
|
||||
rule := ctx.ModuleForTests("myapex", "android_common_myapex_image").Rule("signapk")
|
||||
expected := "testkey.x509.pem testkey.pk8"
|
||||
if actual := rule.Args["certificates"]; actual != expected {
|
||||
t.Errorf("certificates should be %q, not %q", expected, actual)
|
||||
}
|
||||
})
|
||||
t.Run("override when specifiec as <:module>", func(t *testing.T) {
|
||||
ctx, _ := testApex(t, `
|
||||
apex {
|
||||
name: "myapex_keytest",
|
||||
key: "myapex.key",
|
||||
file_contexts: ":myapex-file_contexts",
|
||||
certificate: ":myapex.certificate",
|
||||
}
|
||||
apex_key {
|
||||
name: "myapex.key",
|
||||
public_key: "testkey.avbpubkey",
|
||||
private_key: "testkey.pem",
|
||||
}
|
||||
android_app_certificate {
|
||||
name: "myapex.certificate.override",
|
||||
certificate: "testkey.override",
|
||||
}`)
|
||||
rule := ctx.ModuleForTests("myapex_keytest", "android_common_myapex_keytest_image").Rule("signapk")
|
||||
expected := "testkey.override.x509.pem testkey.override.pk8"
|
||||
if actual := rule.Args["certificates"]; actual != expected {
|
||||
t.Errorf("certificates should be %q, not %q", expected, actual)
|
||||
}
|
||||
})
|
||||
t.Run("if specified as name, finds it from DefaultDevKeyDir", func(t *testing.T) {
|
||||
ctx, _ := testApex(t, `
|
||||
apex {
|
||||
name: "myapex",
|
||||
key: "myapex.key",
|
||||
certificate: "testkey",
|
||||
}
|
||||
apex_key {
|
||||
name: "myapex.key",
|
||||
public_key: "testkey.avbpubkey",
|
||||
private_key: "testkey.pem",
|
||||
}`)
|
||||
rule := ctx.ModuleForTests("myapex", "android_common_myapex_image").Rule("signapk")
|
||||
expected := "vendor/foo/devkeys/testkey.x509.pem vendor/foo/devkeys/testkey.pk8"
|
||||
if actual := rule.Args["certificates"]; actual != expected {
|
||||
t.Errorf("certificates should be %q, not %q", expected, actual)
|
||||
}
|
||||
})
|
||||
t.Run("override when specified as <name>", func(t *testing.T) {
|
||||
ctx, _ := testApex(t, `
|
||||
apex {
|
||||
name: "myapex_keytest",
|
||||
key: "myapex.key",
|
||||
file_contexts: ":myapex-file_contexts",
|
||||
certificate: "testkey",
|
||||
}
|
||||
apex_key {
|
||||
name: "myapex.key",
|
||||
public_key: "testkey.avbpubkey",
|
||||
private_key: "testkey.pem",
|
||||
}
|
||||
android_app_certificate {
|
||||
name: "myapex.certificate.override",
|
||||
certificate: "testkey.override",
|
||||
}`)
|
||||
rule := ctx.ModuleForTests("myapex_keytest", "android_common_myapex_keytest_image").Rule("signapk")
|
||||
expected := "testkey.override.x509.pem testkey.override.pk8"
|
||||
if actual := rule.Args["certificates"]; actual != expected {
|
||||
t.Errorf("certificates should be %q, not %q", expected, actual)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestMacro(t *testing.T) {
|
||||
ctx, _ := testApex(t, `
|
||||
apex {
|
||||
|
@@ -495,15 +495,17 @@ func (a *apexBundle) buildFlattenedApex(ctx android.ModuleContext) {
|
||||
}
|
||||
|
||||
func (a *apexBundle) setCertificateAndPrivateKey(ctx android.ModuleContext) {
|
||||
cert := String(a.properties.Certificate)
|
||||
if cert != "" && android.SrcIsModule(cert) == "" {
|
||||
defaultDir := ctx.Config().DefaultAppCertificateDir(ctx)
|
||||
a.container_certificate_file = defaultDir.Join(ctx, cert+".x509.pem")
|
||||
a.container_private_key_file = defaultDir.Join(ctx, cert+".pk8")
|
||||
} else if cert == "" {
|
||||
pem, key := ctx.Config().DefaultAppCertificate(ctx)
|
||||
a.container_certificate_file = pem
|
||||
a.container_private_key_file = key
|
||||
if a.container_certificate_file == nil {
|
||||
cert := String(a.properties.Certificate)
|
||||
if cert == "" {
|
||||
pem, key := ctx.Config().DefaultAppCertificate(ctx)
|
||||
a.container_certificate_file = pem
|
||||
a.container_private_key_file = key
|
||||
} else {
|
||||
defaultDir := ctx.Config().DefaultAppCertificateDir(ctx)
|
||||
a.container_certificate_file = defaultDir.Join(ctx, cert+".x509.pem")
|
||||
a.container_private_key_file = defaultDir.Join(ctx, cert+".pk8")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user