From ec895f0e93a510f23a954a52ea7914a75ee35341 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Tue, 24 Nov 2020 11:19:20 +0000 Subject: msm8996-common: camera: Switch to display_headers lib include LOCAL_COPY_HEADERS is deprecated and Qualcomm HALs have been updated to remove its usage. As a consequence, the display headers are no longer copied to TARGET_OUT_HEADERS, so use the equivalent header lib instead. Change-Id: I85d229e536146b86662e9c9a28017d2448c856dd --- camera/QCamera2/Android.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index 8977469..f0e287d 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -98,8 +98,6 @@ ifneq (,$(filter msm8996 msmcobalt,$(TARGET_BOARD_PLATFORM))) endif #LOCAL_STATIC_LIBRARIES := libqcamera2_util -LOCAL_C_INCLUDES += \ - $(TARGET_OUT_HEADERS)/qcom/display LOCAL_C_INCLUDES += \ $(call project-path-for,qcom-display)/libqservice LOCAL_SHARED_LIBRARIES := liblog libhardware libutils libcutils libdl libsync @@ -114,6 +112,7 @@ ifeq ($(TARGET_TS_MAKEUP),true) LOCAL_SHARED_LIBRARIES += libts_face_beautify_hal libts_detected_face_hal endif LOCAL_HEADER_LIBRARIES += camera_common_headers +LOCAL_HEADER_LIBRARIES += display_headers LOCAL_HEADER_LIBRARIES += media_plugin_headers LOCAL_HEADER_LIBRARIES += libandroid_sensor_headers LOCAL_HEADER_LIBRARIES += libcutils_headers -- cgit v1.2.3