Allows prebuilts in override_apex.

Bug: 197787336
Test: Create an override_apex that uses a different `prebuilts` than its
      base. Observe built contents.
Test: apex_test.go
Change-Id: I7666ed6cfe3f2fa5dd81e5f8c1961477dabbbd3c
This commit is contained in:
Daniel Norman
2021-08-26 15:44:43 -07:00
parent 0fd548dcd0
commit 5a3ce13c6a
3 changed files with 39 additions and 23 deletions

View File

@@ -6074,6 +6074,7 @@ func TestOverrideApex(t *testing.T) {
key: "myapex.key",
apps: ["app"],
bpfs: ["bpf"],
prebuilts: ["myetc"],
overrides: ["oldapex"],
updatable: false,
}
@@ -6083,6 +6084,7 @@ func TestOverrideApex(t *testing.T) {
base: "myapex",
apps: ["override_app"],
bpfs: ["override_bpf"],
prebuilts: ["override_myetc"],
overrides: ["unknownapex"],
logging_parent: "com.foo.bar",
package_name: "test.overridden.package",
@@ -6131,6 +6133,16 @@ func TestOverrideApex(t *testing.T) {
name: "override_bpf",
srcs: ["override_bpf.c"],
}
prebuilt_etc {
name: "myetc",
src: "myprebuilt",
}
prebuilt_etc {
name: "override_myetc",
src: "override_myprebuilt",
}
`, withManifestPackageNameOverrides([]string{"myapex:com.android.myapex"}))
originalVariant := ctx.ModuleForTests("myapex", "android_common_myapex_image").Module().(android.OverridableModule)
@@ -6152,6 +6164,9 @@ func TestOverrideApex(t *testing.T) {
ensureNotContains(t, copyCmds, "image.apex/etc/bpf/bpf.o")
ensureContains(t, copyCmds, "image.apex/etc/bpf/override_bpf.o")
ensureNotContains(t, copyCmds, "image.apex/etc/myetc")
ensureContains(t, copyCmds, "image.apex/etc/override_myetc")
apexBundle := module.Module().(*apexBundle)
name := apexBundle.Name()
if name != "override_myapex" {