diff options
| author | 2021-08-25 22:23:41 -0700 | |
|---|---|---|
| committer | 2021-08-31 21:20:27 -0700 | |
| commit | cebf0493bfe008fe57ead09fa3f45a45ee134204 (patch) | |
| tree | 35b3b12a51c511f0d36b7c0388c64274c205a4ad | |
| parent | 6f3ebef58828a5ca3ecdcff085b508db18bc2cd7 (diff) | |
[services.incremental] Use shared libutils for remount
Bug: http://b/197965342
services.incremental depends on libbinder.so, which already depends on
libutils.so. When linking services.incremental with libutils.a, the
linker tries to open objects from libutils.a to redefine undefined
symbols in libbinder.so. This causes a linker failure with upstream
LLD. Switching to shared libutils.so instead doesn't increase the
dependency closure for services.incremental.
Test: build with aosp/1809741 which has lld with the above behavior.
Change-Id: I2735461ae64ef2e4c0afc170f7b765c1b5b9432e
| -rw-r--r-- | services/incremental/Android.bp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/incremental/Android.bp b/services/incremental/Android.bp index 1a960484fb52..bf1a64e28c85 100644 --- a/services/incremental/Android.bp +++ b/services/incremental/Android.bp @@ -65,7 +65,6 @@ cc_defaults { "libincremental_manager_aidl-cpp", "libprotobuf-cpp-lite", "service.incremental.proto", - "libutils", "libvold_binder", "libc++fs", ], @@ -77,6 +76,7 @@ cc_defaults { "libincfs", "liblog", "libpermission", + "libutils", "libz", "libziparchive", ], |