Merge "Use getpwnam() instead of AID_* macros" am: a124b81ac8 am: f7bcce468f am: f16e492e94
am: 43aeb8442d  -s ours

Change-Id: Ibfbec2ca30ea4c2e4a2b4eea33295e80ac011429
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 867af85..4ca4281 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1678,6 +1678,7 @@
 ########################
 include $(CLEAR_VARS)
 LOCAL_MODULE := libwpa_hidl
+LOCAL_VENDOR_MODULE := true
 LOCAL_CPPFLAGS := $(L_CPPFLAGS)
 LOCAL_CFLAGS := $(L_CFLAGS)
 LOCAL_C_INCLUDES := $(INCLUDES)
@@ -1696,7 +1697,8 @@
     libhidlbase \
     libhidltransport \
     libhwbinder \
-    libutils
+    libutils \
+    liblog
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
     $(LOCAL_PATH)/hidl/$(HIDL_INTERFACE_VERSION)
 include $(BUILD_STATIC_LIBRARY)