diff options
| author | William Roberts <william.c.roberts@intel.com> | 2015-08-04 14:23:04 -0700 |
|---|---|---|
| committer | dcashman <dcashman@google.com> | 2015-10-22 15:21:26 -0700 |
| commit | bd2d961cc2875259677e34211d2e8ec071b0d8da (patch) | |
| tree | a110456a2f1432587b83785d34ff2fa4ee161597 | |
| parent | c52b3c08fa5ea3680ffcd68c2a1d0542d09f0509 (diff) | |
| download | core-bd2d961cc2875259677e34211d2e8ec071b0d8da.tar.gz core-bd2d961cc2875259677e34211d2e8ec071b0d8da.tar.bz2 core-bd2d961cc2875259677e34211d2e8ec071b0d8da.zip | |
init/adb: correct static lib dependencies for libselinux
Now that libselinux uses libpackagelistparser, in order
for libpackagelistparser to be properly statically linked
liblog must come after libselinux for all the liblog
references to be defined in libpackagelistparser which
is included in libselinux. This patch corrects that order.
Change-Id: I7aee10c9395310919779ed2463aab6b2f8b380cc
Signed-off-by: William Roberts <william.c.roberts@intel.com>
| -rw-r--r-- | adb/Android.mk | 2 | ||||
| -rw-r--r-- | init/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index e10e3ef08..2538e2e3f 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -296,9 +296,9 @@ LOCAL_STATIC_LIBRARIES := \ libfs_mgr \ libfec \ libfec_rs \ + libselinux \ liblog \ libmincrypt \ - libselinux \ libext4_utils_static \ libsquashfs_utils \ libcutils \ diff --git a/init/Android.mk b/init/Android.mk index 8e45a7aaa..d6cb4e588 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -92,9 +92,9 @@ LOCAL_STATIC_LIBRARIES := \ libbase \ libext4_utils_static \ libutils \ - liblog \ libc \ libselinux \ + liblog \ libmincrypt \ libcrypto_static \ libc++_static \ |