commit e4ba481e55e2b0e1cb1fa528005bcfc3da361424
author Alex Deymo <deymo@google.com> Thu Dec 10 22:18:33 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 10 22:18:33 2015 +0000
tree 647447adcd26454f8d771217515d3fb39b22ca5d
parent daea81b234ad10d0ecd0410521e517fa89f7b2e0
parent 2eab379c2966e0d9aad3e1dd6b3a4df50e2504c3

Merge "Drop the "-host" suffix on libchrome and libbrillo."

Android.mk

diff --git a/Android.mk b/Android.mk
index ed371ce..0597666 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,7 +25,7 @@
     $(LOCAL_PATH) \
     $(TOP)/external/dbus \
     $(TOP)/external/gtest/include
-LOCAL_SHARED_LIBRARIES := libbrillo-host libchrome-host
+LOCAL_SHARED_LIBRARIES := libbrillo libchrome
 LOCAL_STATIC_LIBRARIES := libexpat
 LOCAL_SRC_FILES := \
     chromeos-dbus-bindings/adaptor_generator.cc \
@@ -44,7 +44,7 @@
 LOCAL_CFLAGS := $(libdbusBindingGenCFlags)
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(TOP)/external/gtest/include
-LOCAL_SHARED_LIBRARIES := libbrillo-host libchrome-host
+LOCAL_SHARED_LIBRARIES := libbrillo libchrome
 LOCAL_SRC_FILES := chromeos-dbus-bindings/generate_chromeos_dbus_bindings.cc
 LOCAL_STATIC_LIBRARIES := libdbus-binding-gen-host libexpat
 include $(BUILD_HOST_EXECUTABLE)
@@ -57,7 +57,7 @@
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH) \
     $(TOP)/external/dbus
-LOCAL_SHARED_LIBRARIES := libbrillo-host libchrome-host
+LOCAL_SHARED_LIBRARIES := libbrillo libchrome
 LOCAL_STATIC_LIBRARIES := libdbus-binding-gen-host libgmock_host libexpat
 LOCAL_SRC_FILES := \
     chromeos-dbus-bindings/adaptor_generator_unittest.cc \