commit 92423df543c8e11070c57585a6450e7f4e9a1a42
author Stuart Scott <stuartscott@google.com> Wed Jul 08 14:36:12 2015 +0000
committer Stuart Scott <stuartscott@google.com> Wed Jul 08 14:18:19 2015 -0700
tree ea4c427aeef328c39ab277d3b17b3c95aac0c6ee
parent 1b545b6700621d46c4c85a83c39706e9f9a2b8af

Revert "Revert "Moving to common compatibility utils.""

This reverts commit 992b459293c4dcae2a12cdf5923e3e26a476bd1a.

This change includes the fix which caused the build breakage which
caused the revert this is reverting.

bug: 21762834
Change-Id: I1df495ba219208b07a7d7c8ac99d2890052caf69

tools/utils/Android.mk

diff --git a/tools/utils/Android.mk b/tools/utils/Android.mk
index 0ba5cf4..d26abb1 100644
--- a/tools/utils/Android.mk
+++ b/tools/utils/Android.mk
@@ -25,6 +25,6 @@
 LOCAL_CLASSPATH := $(HOST_JDK_TOOLS_JAR)
 
 LOCAL_JAVA_LIBRARIES := junit
-LOCAL_STATIC_JAVA_LIBRARIES := ctsabiutilslib vogarexpectlib
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-host-util vogarexpectlib
 
 include $(BUILD_HOST_JAVA_LIBRARY)