diff options
| author | Colin Cross <ccross@android.com> | 2021-11-30 11:31:44 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2021-11-30 11:31:44 -0800 |
| commit | 9d206e57a9f6b80d8bb948198f790289e8d34608 (patch) | |
| tree | 9f79ed90aa9c33114ed7b9747fa4ff9c1c338fcf | |
| parent | e645235f0a5280d84734fec72d24e8d1eb20fd63 (diff) | |
| download | manifest-9d206e57a9f6b80d8bb948198f790289e8d34608.tar.gz | |
Add non-apex dependencies of libbpf_android
Upcoming license changes use the existence of a dependency to track
license requirements. libmeminfo depends on libbpf_android, and then
removes the dependency with target.apex.exclude_static_libs. The apex
mutator runs after the deps mutator, which means the dependency already
exists before the apex variant is created, and is annotated to be
ignored in the apex variant. The licensing code is unaware that the
dependency is ignored, causing it to traverse into libbpf_android
and hit missing dependency errors. Add the dependencies of libbpf_android
as a workaround.
Bug: 207445310
Test: art/tools/buildbot-build.sh --target
Change-Id: I336aeb2062493021ffc2d73d195c629c0e35cf50
| -rw-r--r-- | default.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/default.xml b/default.xml index ef4a8d997..52c51f593 100644 --- a/default.xml +++ b/default.xml @@ -62,6 +62,9 @@ <!-- For dexdiag --> <project path="system/memory/libmeminfo" name="platform/system/memory/libmeminfo" groups="pdk" /> <project path="system/bpf" name="platform/system/bpf" groups="pdk" /> + <!-- for libbpf_android --> + <project path="external/bcc" name="platform/external/bcc" groups="pdk" /> + <project path="frameworks/libs/net" name="platform/frameworks/libs/net" groups="pdk" /> <!-- For libnativeloader --> <project path="system/libsysprop" name="platform/system/libsysprop" groups="pdk" /> |