From 7401aeadf2078c3650b832488de7f494cf5f36c0 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Tue, 27 Oct 2020 12:53:56 +0400 Subject: [PATCH] tiare: camera: Drop usage of LOCAL_COPY_HEADERS Google deprecated LOCAL_COPY_HEADERS in Android 11, so use LOCAL_EXPORT_C_INCLUDE_DIRS instead. Ref: https://android.googlesource.com/platform/build/soong/+/master/docs/best_practices.md#headers. Conflicts: camera/QCamera2/stack/mm-camera-interface/Android.mk Signed-off-by: Ali Hasan Signed-off-by: Aryan Sinha --- camera/QCamera2/Android.mk | 10 ++++++---- camera/QCamera2/{ => HAL3}/QCameraFormat.h | 0 camera/QCamera2/stack/mm-camera-interface/Android.mk | 4 +--- 3 files changed, 7 insertions(+), 7 deletions(-) rename camera/QCamera2/{ => HAL3}/QCameraFormat.h (100%) diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index 8c1b854..3247e79 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -4,9 +4,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := qcom/camera -LOCAL_COPY_HEADERS := QCameraFormat.h - LOCAL_SRC_FILES := \ util/QCameraBufferMaps.cpp \ util/QCameraCmdThread.cpp \ @@ -84,7 +81,6 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../mm-image-codec/qexif \ $(LOCAL_PATH)/../mm-image-codec/qomx_core \ $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/stack/common \ $(LOCAL_PATH)/stack/mm-camera-interface/inc \ $(LOCAL_PATH)/util \ $(LOCAL_PATH)/HAL3 \ @@ -97,6 +93,7 @@ LOCAL_HEADER_LIBRARIES += libandroid_sensor_headers LOCAL_HEADER_LIBRARIES += libcutils_headers LOCAL_HEADER_LIBRARIES += libsystem_headers LOCAL_HEADER_LIBRARIES += libhardware_headers +LOCAL_HEADER_LIBRARIES += camera_common_headers #HAL 1.0 Include paths LOCAL_C_INCLUDES += \ @@ -146,5 +143,10 @@ LOCAL_MODULE_TAGS := optional LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) +include $(CLEAR_VARS) +LOCAL_MODULE := camera_common_headers +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/stack/common +include $(BUILD_HEADER_LIBRARY) + include $(call first-makefiles-under,$(LOCAL_PATH)) endif diff --git a/camera/QCamera2/QCameraFormat.h b/camera/QCamera2/HAL3/QCameraFormat.h similarity index 100% rename from camera/QCamera2/QCameraFormat.h rename to camera/QCamera2/HAL3/QCameraFormat.h diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk index 149d9b4..57b4655 100644 --- a/camera/QCamera2/stack/mm-camera-interface/Android.mk +++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk @@ -6,6 +6,7 @@ include $(CLEAR_VARS) LOCAL_HEADER_LIBRARIES := libhardware_headers LOCAL_HEADER_LIBRARIES += media_plugin_headers +LOCAL_HEADER_LIBRARIES += camera_common_headers MM_CAM_FILES := \ src/mm_camera_interface.c \ @@ -36,9 +37,6 @@ ifneq (,$(filter msm8996 msmcobalt msmfalcon,$(TARGET_BOARD_PLATFORM))) endif LOCAL_CFLAGS += -D_ANDROID_ -DQCAMERA_REDEFINE_LOG -LOCAL_COPY_HEADERS_TO := mm-camera-interface -LOCAL_COPY_HEADERS += ../common/cam_intf.h -LOCAL_COPY_HEADERS += ../common/cam_types.h LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/inc \