From 504baeed4c68f3549f36549a4b4c518acd65e2f4 Mon Sep 17 00:00:00 2001 From: Abhishek Jain Date: Tue, 3 Apr 2018 19:18:26 +0530 Subject: 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 --- camera/QCamera2/Android.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'camera/QCamera2/Android.mk') diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index 39a9ef6..8246d45 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -80,12 +80,9 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/stack/mm-camera-interface/inc \ $(LOCAL_PATH)/util \ $(LOCAL_PATH)/HAL3 \ - hardware/libhardware/include/hardware \ $(call project-path-for,qcom-media)/libstagefrighthw \ $(call project-path-for,qcom-media)/mm-core/inc \ - system/core/include/cutils \ - system/core/include/system \ - system/media/camera/include/system + $(TARGET_OUT_HEADERS)/mm-camera-lib/cp/prebuilt #HAL 1.0 Include paths LOCAL_C_INCLUDES += \ @@ -121,6 +118,10 @@ ifeq ($(TARGET_TS_MAKEUP),true) LOCAL_SHARED_LIBRARIES += libts_face_beautify_hal libts_detected_face_hal endif LOCAL_HEADER_LIBRARIES += media_plugin_headers +LOCAL_HEADER_LIBRARIES += libandroid_sensor_headers +LOCAL_HEADER_LIBRARIES += libcutils_headers +LOCAL_HEADER_LIBRARIES += libsystem_headers +LOCAL_HEADER_LIBRARIES += libhardware_headers LOCAL_STATIC_LIBRARIES := android.hardware.camera.common@1.0-helper -- cgit v1.2.3