diff options
author | 2021-08-26 22:10:06 +0800 | |
---|---|---|
committer | 2021-08-27 03:03:45 +0000 | |
commit | 7c803b87466cc93efcf1827f1459bb2bf57c0731 (patch) | |
tree | 51c2972e4c2ddfef0c0b240cd251b4bf448a94ef /apex/apex_test.go | |
parent | 35fc86c9cf4d0451ec88e7575a26f89f52c13985 (diff) |
Make bpfs properties overridable
To support different variable bpfs file between mainline module and
non-updatable module(e.g. Android GO). Make bpfs properties overridable.
Test: m
Bug: 190523685
Change-Id: I4c63e35f74230de94b21f3ceb2beb90f0f9ddb11
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 f07bf6379..67f77221e 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -6034,6 +6034,7 @@ func TestOverrideApex(t *testing.T) { name: "myapex", key: "myapex.key", apps: ["app"], + bpfs: ["bpf"], overrides: ["oldapex"], updatable: false, } @@ -6042,6 +6043,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", @@ -6080,6 +6082,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) @@ -6098,6 +6110,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" { @@ -6120,10 +6135,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") |