Merge changes from topic "libhardware_vndk"android-o-mr1-preview-2android-o-mr1-preview-1

* changes:
  Build tv_input.default.vendor with BOARD_VNDK_VERSION
  Build fingerprint.default with BOARD_VNDK_VERSION
  Build power.default with BOARD_VNDK_VERSION
  Build local_time.default with BOARD_VNDK_VERSION
  Build nfc.default with BOARD_VNDK_VERSION
  Build vr.default with BOARD_VNDK_VERSION
  Build vibrator.default.vendor with BOARD_VNDK_VERSION
  Build audio.usb.default with BOARD_VNDK_VERSION
  Build vehicle.default with BOARD_VNDK_VERSION
  Build audio.primary.default, audio.stub.default, audio_policy.stub with BOARD_VNDK_VERSION
  Build radio.fm.default.vendor with BOARD_VNDK_VERSION
  Build consumerir.default with BOARD_VNDK_VERSION

12 files changed, 17 insertions, 2 deletions

diff --git a/modules/audio/Android.bp b/modules/audio/Android.bp
index 84daead2..a7467c29 100644
--- a/modules/audio/Android.bp
+++ b/modules/audio/Android.bp
@@ -23,6 +23,7 @@ cc_library_shared {
     relative_install_path: "hw",
     proprietary: true,
     srcs: ["audio_hw.c"],
+    header_libs: ["libhardware_headers"],
     shared_libs: [
         "liblog",
     ],
@@ -40,6 +41,7 @@ cc_library_shared {
     relative_install_path: "hw",
     proprietary: true,
     srcs: ["audio_hw.c"],
+    header_libs: ["libhardware_headers"],
     shared_libs: [
         "liblog",
     ],
@@ -53,6 +55,7 @@ cc_library_shared {
     relative_install_path: "hw",
     proprietary: true,
     srcs: ["audio_policy.c"],
+    header_libs: ["libhardware_headers"],
     shared_libs: [
         "liblog",
     ],
diff --git a/modules/consumerir/Android.bp b/modules/consumerir/Android.bp
index b1394927..6ba37b62 100644
--- a/modules/consumerir/Android.bp
+++ b/modules/consumerir/Android.bp
@@ -17,6 +17,7 @@ cc_library_shared {
     relative_install_path: "hw",
     proprietary: true,
     srcs: ["consumerir.c"],
+    header_libs: ["libhardware_headers"],
     shared_libs: [
         "liblog",
     ],
diff --git a/modules/fingerprint/Android.bp b/modules/fingerprint/Android.bp
index ba749e4f..a8246082 100644
--- a/modules/fingerprint/Android.bp
+++ b/modules/fingerprint/Android.bp
@@ -17,5 +17,6 @@ cc_library_shared {
     relative_install_path: "hw",
     proprietary: true,
     srcs: ["fingerprint.c"],
+    header_libs: ["libhardware_headers"],
     shared_libs: ["liblog"],
 }
diff --git a/modules/local_time/Android.bp b/modules/local_time/Android.bp
index 643afa53..153b7e4a 100644
--- a/modules/local_time/Android.bp
+++ b/modules/local_time/Android.bp
@@ -26,6 +26,7 @@ cc_library_shared {
     relative_install_path: "hw",
     proprietary: true,
     srcs: ["local_time_hw.c"],
+    header_libs: ["libhardware_headers"],
     shared_libs: [
         "liblog",
         "libcutils",
diff --git a/modules/nfc/Android.bp b/modules/nfc/Android.bp
index 10dc2c16..b4bc9b1f 100644
--- a/modules/nfc/Android.bp
+++ b/modules/nfc/Android.bp
@@ -17,6 +17,7 @@ cc_library_shared {
     relative_install_path: "hw",
     proprietary: true,
     srcs: ["nfc_pn544_example.c"],
+    header_libs: ["libhardware_headers"],
     shared_libs: [
         "liblog",
     ],
diff --git a/modules/power/Android.bp b/modules/power/Android.bp
index f4c74ce0..41ac45c6 100644
--- a/modules/power/Android.bp
+++ b/modules/power/Android.bp
@@ -17,5 +17,9 @@ cc_library_shared {
     relative_install_path: "hw",
     proprietary: true,
     srcs: ["power.c"],
+    header_libs: [
+        "libhardware_headers",
+        "libutils_headers",
+    ],
     shared_libs: ["liblog"],
 }
diff --git a/modules/radio/Android.bp b/modules/radio/Android.bp
index 01dc035f..7f98f0dc 100644
--- a/modules/radio/Android.bp
+++ b/modules/radio/Android.bp
@@ -23,6 +23,7 @@ cc_library_shared {
         "-Wno-unused-parameter",
         "-Werror",
     ],
+    header_libs: ["libhardware_headers"],
     shared_libs: [
         "liblog",
         "libcutils",
diff --git a/modules/tv_input/Android.bp b/modules/tv_input/Android.bp
index 509198db..4d2369eb 100644
--- a/modules/tv_input/Android.bp
+++ b/modules/tv_input/Android.bp
@@ -16,6 +16,7 @@ cc_library_shared {
     name: "tv_input.default",
     relative_install_path: "hw",
     proprietary: true,
+    header_libs: ["libhardware_headers"],
     shared_libs: [
         "libcutils",
         "liblog",
diff --git a/modules/usbaudio/audio_hal.c b/modules/usbaudio/audio_hal.c
index df4bc0f7..e93396ff 100644
--- a/modules/usbaudio/audio_hal.c
+++ b/modules/usbaudio/audio_hal.c
@@ -23,6 +23,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/time.h>
+#include <unistd.h>
 
 #include <log/log.h>
 #include <cutils/list.h>
diff --git a/modules/vehicle/Android.mk b/modules/vehicle/Android.mk
index 9fd49dac..34c943ce 100644
--- a/modules/vehicle/Android.mk
+++ b/modules/vehicle/Android.mk
@@ -20,8 +20,8 @@ LOCAL_MODULE := vehicle.default
 
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_PROPRIETARY_MODULE := true
-LOCAL_C_INCLUDES := hardware/libhardware
 LOCAL_SRC_FILES := vehicle.c timeUtil.cpp
+LOCAL_HEADER_LIBRARIES := libhardware_headers
 LOCAL_SHARED_LIBRARIES := liblog libcutils libutils
 LOCAL_MODULE_TAGS := optional
 
diff --git a/modules/vibrator/Android.bp b/modules/vibrator/Android.bp
index 3c4aebf2..fdbfd611 100644
--- a/modules/vibrator/Android.bp
+++ b/modules/vibrator/Android.bp
@@ -19,7 +19,7 @@ cc_library_shared {
     // hw/<VIBRATOR_HARDWARE_MODULE_ID>.default.so
     relative_install_path: "hw",
     proprietary: true,
-    include_dirs: ["hardware/libhardware"],
+    header_libs: ["libhardware_headers"],
     srcs: ["vibrator.c"],
     shared_libs: ["liblog"],
 }
diff --git a/modules/vr/Android.mk b/modules/vr/Android.mk
index e04c0da4..0305745a 100644
--- a/modules/vr/Android.mk
+++ b/modules/vr/Android.mk
@@ -20,6 +20,7 @@ LOCAL_MODULE := vr.default
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_PROPRIETARY_MODULE := true
 LOCAL_SRC_FILES := vr.c
+LOCAL_HEADER_LIBRARIES := libhardware_headers
 LOCAL_SHARED_LIBRARIES := libcutils
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS += -Wno-unused-parameter