commit 45ca9f203b5d3630b5dec91896d84b8ac1e7e724
author Alex Deymo <deymo@google.com> Thu Jan 26 00:01:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 26 00:01:41 2017 +0000
tree 6c10f7df4fa494bf426952e965dd045f03a83146
parent e3a55e2b31a7f6526eaea39020b93e8498231717
parent ade61afd29a70322eaf630c9aaa93c9c150a9355

Merge "Remove '_static' suffix from libext2* references." am: 56ff8061b1 am: 5b5b8333e0 am: 9518d34c0f
am: ade61afd29

Change-Id: I8e5a22261264f0fd5506e9916a37e1af20261645

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 1dbd2b6..a7e7b3c 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -100,7 +100,7 @@
     libext2_com_err \
     libext2_blkid \
     libext2_quota \
-    libext2_uuid_static \
+    libext2_uuid \
     libext2_e2p \
     libext2fs
 

updater/Android.mk

diff --git a/updater/Android.mk b/updater/Android.mk
index d8a84c2..ac26bf4 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -18,7 +18,7 @@
     libext2_com_err \
     libext2_blkid \
     libext2_quota \
-    libext2_uuid_static \
+    libext2_uuid \
     libext2_e2p \
     libext2fs