diff options
| author | Bruno Martins <bgcngm@gmail.com> | 2020-09-22 14:47:33 +0100 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2021-10-19 15:09:38 +0200 |
| commit | 87129b81d822e6a3d5c5ae58ccfa4e8626c89a55 (patch) | |
| tree | ab7e5d82bdd68ebc8b12bbcfa55c47c344742554 /camera/QCamera2/Android.mk | |
| parent | 33342dcf37ae7baefb3f0bec6f337451dc53cf30 (diff) | |
msm8996-common: 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.
Change-Id: Id68bc83cf74f2af0037331ebe4d17819021b88e8
Diffstat (limited to 'camera/QCamera2/Android.mk')
| -rw-r--r-- | camera/QCamera2/Android.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index 69b0e3e..8977469 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -73,7 +73,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 \ @@ -114,6 +113,7 @@ endif 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 += media_plugin_headers LOCAL_HEADER_LIBRARIES += libandroid_sensor_headers LOCAL_HEADER_LIBRARIES += libcutils_headers @@ -131,5 +131,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 |