commit 8031c2d2bb0881ef3c46aafdde87af47cc2fe595
author Alex Deymo <deymo@google.com> Thu Jan 12 21:23:09 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 12 21:23:10 2017 +0000
tree bb1660b5ca34363a4952b9deee3f7742208473aa
parent 37d74f3e201d6ac06d8e8ad3dcef3e848a54183f
parent 67f3aa880499c1143ed9aa1e5294a912a6962f28

Merge changes from topic 'host_suffix_cleanup'

* changes:
  Remove "_static" suffix from libsparse
  Remove "_static" suffix from libext4_utils.

Android.mk

diff --git a/Android.mk b/Android.mk
index 2943f01..633f18d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -76,8 +76,8 @@
 LOCAL_STATIC_LIBRARIES := \
     libbatterymonitor \
     libbootloader_message \
-    libext4_utils_static \
-    libsparse_static \
+    libext4_utils \
+    libsparse \
     libziparchive \
     libotautil \
     libmounts \

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 0aca8c6..1203817 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -99,8 +99,8 @@
     libfs_mgr \
     liblog \
     libselinux \
-    libext4_utils_static \
-    libsparse_static \
+    libext4_utils \
+    libsparse \
     libcrypto_utils \
     libcrypto \
     libcutils \

updater/Android.mk

diff --git a/updater/Android.mk b/updater/Android.mk
index 5d328a3..d8a84c2 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -31,13 +31,13 @@
     libutils \
     libmounts \
     libotafault \
-    libext4_utils_static \
+    libext4_utils \
     libfec \
     libfec_rs \
     libfs_mgr \
     liblog \
     libselinux \
-    libsparse_static \
+    libsparse \
     libsquashfs_utils \
     libbz \
     libz \