diff options
| author | Abhishek Jain <abhij@codeaurora.org> | 2018-04-03 19:18:26 +0530 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2020-01-25 14:48:43 +0100 |
| commit | 504baeed4c68f3549f36549a4b4c518acd65e2f4 (patch) | |
| tree | bdde8e830ba2eca904c1239132fb4a8e9798c645 /camera/QCamera2/stack | |
| parent | 48c62c50622c3e3c745eda535b0838f538a02413 (diff) | |
msm8996-common: qcom-camera: Completed FR49059 and FR49058
FR49059: Accessing AOSP/Google projects Headers
Description: Vendor modules cannot refer AOSP header
paths with absolute or Global Paths instead add
corresponding header library
FR49058 : VNDK compliance
Description : VNDK is set of AOSP libraries which
are exposed to vendor (partition) for development.
Example :
error: vendor lib "/vendor/lib/libeffects.so"
depends on non-eligible lib
"/system/lib/libeffectsconfig.so".
Here , QCOM vendor-partition Library
using lib outside VNDK from system.
CRs-Fixed: 2217547
Change-Id: I51a88145fccba592080d6287ae7ff14d12c65296
Diffstat (limited to 'camera/QCamera2/stack')
| -rw-r--r-- | camera/QCamera2/stack/mm-camera-interface/Android.mk | 4 | ||||
| -rw-r--r-- | camera/QCamera2/stack/mm-jpeg-interface/Android.mk | 5 | ||||
| -rw-r--r-- | camera/QCamera2/stack/mm-lib2d-interface/Android.mk | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk index 9b96326..f6e55a7 100644 --- a/camera/QCamera2/stack/mm-camera-interface/Android.mk +++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk @@ -34,7 +34,6 @@ LOCAL_COPY_HEADERS += ../common/cam_types.h LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/inc \ $(LOCAL_PATH)/../common \ - hardware/libhardware/include/hardware \ $(call project-path-for,qcom-media)/media/mm-core/inc \ system/media/camera/include \ @@ -51,8 +50,9 @@ LOCAL_SRC_FILES := $(MM_CAM_FILES) LOCAL_MODULE := libmmcamera_interface LOCAL_PRELINK_MODULE := false -LOCAL_SHARED_LIBRARIES := libdl libcutils liblog libutils +LOCAL_SHARED_LIBRARIES := libdl libcutils liblog LOCAL_HEADER_LIBRARIES := libsystem_headers libhardware_headers +LOCAL_HEADER_LIBRARIES += media_plugin_headers LOCAL_HEADER_LIBRARIES += generated_kernel_headers LOCAL_MODULE_TAGS := optional LOCAL_VENDOR_MODULE := true diff --git a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk index 3a3a1c6..2885620 100644 --- a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk +++ b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk @@ -9,11 +9,12 @@ LOCAL_CFLAGS+= -D_ANDROID_ -DQCAMERA_REDEFINE_LOG LOCAL_CFLAGS += -Wall -Wextra -Werror -Wno-unused-parameter LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_HEADER_LIBRARIES += libutils_headers +LOCAL_HEADER_LIBRARIES += media_plugin_headers LIB2D_ROTATION=false LOCAL_C_INCLUDES += \ - frameworks/native/include/media/openmax \ $(LOCAL_PATH)/inc \ $(LOCAL_PATH)/../common \ $(LOCAL_PATH)/../mm-camera-interface/inc \ @@ -68,7 +69,7 @@ LOCAL_SRC_FILES := \ LOCAL_MODULE := libmmjpeg_interface LOCAL_PRELINK_MODULE := false -LOCAL_SHARED_LIBRARIES := libdl libcutils liblog libqomx_core libmmcamera_interface libutils +LOCAL_SHARED_LIBRARIES := libdl libcutils liblog libqomx_core libmmcamera_interface ifeq ($(strip $(LIB2D_ROTATION)),true) LOCAL_SHARED_LIBRARIES += libmmlib2d_interface endif diff --git a/camera/QCamera2/stack/mm-lib2d-interface/Android.mk b/camera/QCamera2/stack/mm-lib2d-interface/Android.mk index 9f72f45..1cbd0b3 100644 --- a/camera/QCamera2/stack/mm-lib2d-interface/Android.mk +++ b/camera/QCamera2/stack/mm-lib2d-interface/Android.mk @@ -9,6 +9,7 @@ LOCAL_CFLAGS+= -D_ANDROID_ -DQCAMERA_REDEFINE_LOG LOCAL_CFLAGS += -Wall -Wextra -Werror -Wno-unused-parameter LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_HEADER_LIBRARIES += libutils_headers IMGLIB_HEADER_PATH := $(TARGET_OUT_INTERMEDIATES)/include/mm-camera/imglib |