diff options
| author | 2020-09-04 09:11:22 +0000 | |
|---|---|---|
| committer | 2020-09-04 09:11:22 +0000 | |
| commit | 288f40ba51649ce702b19667d11def58601d797c (patch) | |
| tree | 093f2384930a18d0ec83bbd8668e55332589696f /apex/apex_test.go | |
| parent | da55e8208f7717b59bd6f5e600efa6d66bd352a3 (diff) | |
| parent | 66a0ae60f81391880dbc9cd13b4ea52aec4b63ff (diff) | |
Merge "Include bpf program in APEXes" am: 66a0ae60f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418308
Change-Id: I86983c1012615e95d1d9aac875a52e92248a17b8
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index d8a91cb90..610f66750 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -27,6 +27,7 @@ import ( "github.com/google/blueprint/proptools" "android/soong/android" + "android/soong/bpf" "android/soong/cc" "android/soong/dexpreopt" prebuilt_etc "android/soong/etc" @@ -257,6 +258,7 @@ func testApexContext(_ *testing.T, bp string, handlers ...testCustomizer) (*andr java.RegisterAppBuildComponents(ctx) java.RegisterSdkLibraryBuildComponents(ctx) ctx.RegisterSingletonType("apex_keys_text", apexKeysTextFactory) + ctx.RegisterModuleType("bpf", bpf.BpfFactory) ctx.PreDepsMutators(RegisterPreDepsMutators) ctx.PostDepsMutators(RegisterPostDepsMutators) @@ -606,6 +608,7 @@ func TestDefaults(t *testing.T) { java_libs: ["myjar"], apps: ["AppFoo"], rros: ["rro"], + bpfs: ["bpf"], } prebuilt_etc { @@ -652,6 +655,11 @@ func TestDefaults(t *testing.T) { theme: "blue", } + bpf { + name: "bpf", + srcs: ["bpf.c", "bpf2.c"], + } + `) ensureExactContents(t, ctx, "myapex", "android_common_myapex_image", []string{ "etc/myetc", @@ -659,6 +667,8 @@ func TestDefaults(t *testing.T) { "lib64/mylib.so", "app/AppFoo/AppFoo.apk", "overlay/blue/rro.apk", + "etc/bpf/bpf.o", + "etc/bpf/bpf2.o", }) } |