Fix multiple build breaks on master
BUG: 72664439
Test: Local build
Change-Id: Iccf7adcb6324f46682f16fab053a771c251127bf
Merged-In: Iccf7adcb6324f46682f16fab053a771c251127bf
(cherry picked from commit cada73fa5ae2909a4736fa6a0e2e877e2563c1d1)
diff --git a/guest/hals/audio/Android.mk b/guest/hals/audio/Android.mk
index 28733ff..75c78e5 100644
--- a/guest/hals/audio/Android.mk
+++ b/guest/hals/audio/Android.mk
@@ -79,11 +79,18 @@
LOCAL_SRC_FILES := \
record_audio.cpp
+LOCAL_CFLAGS := \
+ -Wall -Werror \
+ $(VSOC_VERSION_CFLAGS)
+
LOCAL_C_INCLUDES := \
device/google/cuttlefish_common \
device/google/cuttlefish_kernel \
frameworks/av/cmds/stagefright \
+LOCAL_HEADER_LIBRARIES := \
+ libhardware_headers
+
LOCAL_SHARED_LIBRARIES := \
libbase \
vsoc_lib
diff --git a/guest/hals/gralloc/Android.mk b/guest/hals/gralloc/Android.mk
index 5e4a648..1dee96a 100644
--- a/guest/hals/gralloc/Android.mk
+++ b/guest/hals/gralloc/Android.mk
@@ -42,6 +42,9 @@
liblog \
vsoc_lib
+LOCAL_HEADER_LIBRARIES := \
+ libhardware_headers
+
ifeq (0, $(shell test $(PLATFORM_SDK_VERSION) -ge 21; echo $$?))
LOCAL_MODULE_RELATIVE_PATH := hw
else
diff --git a/guest/hals/hwcomposer/Android.mk b/guest/hals/hwcomposer/Android.mk
index 421ee52..1a8c44f 100644
--- a/guest/hals/hwcomposer/Android.mk
+++ b/guest/hals/hwcomposer/Android.mk
@@ -49,6 +49,10 @@
ifeq (true, $(TARGET_TRANSLATE_2ND_ARCH))
LOCAL_MULTILIB := first
endif
+
+LOCAL_HEADER_LIBRARIES := \
+ libhardware_headers
+
include $(BUILD_SHARED_LIBRARY)
include $(call first-makefiles-under,$(LOCAL_PATH))
diff --git a/guest/hals/hwcomposer/legacy/hwcomposer.mk b/guest/hals/hwcomposer/legacy/hwcomposer.mk
index e052ed1..3913d1d 100644
--- a/guest/hals/hwcomposer/legacy/hwcomposer.mk
+++ b/guest/hals/hwcomposer/legacy/hwcomposer.mk
@@ -15,6 +15,7 @@
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_MULTILIB := first
LOCAL_MODULE_TAGS := optional
+LOCAL_VENDOR_MODULE := true
LOCAL_SHARED_LIBRARIES := \
libbase \
