diff options
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 600f6c217..b9285ae4c 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -6073,6 +6073,7 @@ func TestOverrideApex(t *testing.T) { name: "myapex", key: "myapex.key", apps: ["app"], + bpfs: ["bpf"], overrides: ["oldapex"], updatable: false, } @@ -6081,6 +6082,7 @@ func TestOverrideApex(t *testing.T) { name: "override_myapex", base: "myapex", apps: ["override_app"], + bpfs: ["override_bpf"], overrides: ["unknownapex"], logging_parent: "com.foo.bar", package_name: "test.overridden.package", @@ -6119,6 +6121,16 @@ func TestOverrideApex(t *testing.T) { base: "app", package_name: "bar", } + + bpf { + name: "bpf", + srcs: ["bpf.c"], + } + + bpf { + name: "override_bpf", + srcs: ["override_bpf.c"], + } `, withManifestPackageNameOverrides([]string{"myapex:com.android.myapex"})) originalVariant := ctx.ModuleForTests("myapex", "android_common_myapex_image").Module().(android.OverridableModule) @@ -6137,6 +6149,9 @@ func TestOverrideApex(t *testing.T) { ensureNotContains(t, copyCmds, "image.apex/app/app/app.apk") ensureContains(t, copyCmds, "image.apex/app/override_app/override_app.apk") + ensureNotContains(t, copyCmds, "image.apex/etc/bpf/bpf.o") + ensureContains(t, copyCmds, "image.apex/etc/bpf/override_bpf.o") + apexBundle := module.Module().(*apexBundle) name := apexBundle.Name() if name != "override_myapex" { @@ -6159,10 +6174,12 @@ func TestOverrideApex(t *testing.T) { data.Custom(&builder, name, "TARGET_", "", data) androidMk := builder.String() ensureContains(t, androidMk, "LOCAL_MODULE := override_app.override_myapex") + ensureContains(t, androidMk, "LOCAL_MODULE := override_bpf.o.override_myapex") ensureContains(t, androidMk, "LOCAL_MODULE := apex_manifest.pb.override_myapex") ensureContains(t, androidMk, "LOCAL_MODULE_STEM := override_myapex.apex") ensureContains(t, androidMk, "LOCAL_OVERRIDES_MODULES := unknownapex myapex") ensureNotContains(t, androidMk, "LOCAL_MODULE := app.myapex") + ensureNotContains(t, androidMk, "LOCAL_MODULE := bpf.myapex") ensureNotContains(t, androidMk, "LOCAL_MODULE := override_app.myapex") ensureNotContains(t, androidMk, "LOCAL_MODULE := apex_manifest.pb.myapex") ensureNotContains(t, androidMk, "LOCAL_MODULE_STEM := myapex.apex") |