ido: camera: Upgrade library dependencies for O

Change-Id: If04e62bbf0905534c03438f95458f0d6c5045ae2 Signed-off-by: Adrian DC <[email protected]>
ido-dev · Feb 4, 2018 · 9303e49 · 9303e49
1 parent d579439
commit 9303e49
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/camera/QCamera2/HAL/Android.mk b/camera/QCamera2/HAL/Android.mk
@@ -35,6 +35,7 @@ endif
 
 LOCAL_C_INCLUDES := \
         $(LOCAL_PATH)/../stack/common \
+        frameworks/native/include \
         frameworks/native/include/media/openmax \
         $(call project-path-for,qcom-display)/libgralloc \
 	$(call project-path-for,qcom-display)/libqdutils \
@@ -64,8 +65,10 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/tsMakeuplib/include
 endif
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
-LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils libdl libgui
+LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils libdl libgui liblog
 LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface libqdMetaData
+LOCAL_SHARED_LIBRARIES += libhidltransport libsensor [email protected] [email protected]
+LOCAL_STATIC_LIBRARIES := libarect
 ifeq ($(TARGET_TS_MAKEUP),true)
 LOCAL_SHARED_LIBRARIES += libts_face_beautify_hal libts_detected_face_hal
 endif

diff --git a/camera/QCamera2/HAL/QCamera2Factory.cpp b/camera/QCamera2/HAL/QCamera2Factory.cpp
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <utils/Errors.h>
 #include <hardware/camera.h>
-#include <gui/SensorManager.h>
+#include <sensor/SensorManager.h>
 
 #include "QCamera2Factory.h"
 

diff --git a/camera/QCamera2/HAL/test/Android.mk b/camera/QCamera2/HAL/test/Android.mk
@@ -18,6 +18,7 @@ LOCAL_SHARED_LIBRARIES:= \
     libskia \
     libstagefright \
     libstagefright_foundation \
+    liblog \
 
 ifneq ($(call is-platform-sdk-version-at-least,18),true)
 

diff --git a/camera/QCamera2/stack/mm-camera-test/Android.mk b/camera/QCamera2/stack/mm-camera-test/Android.mk
@@ -95,7 +95,7 @@ endif
 LOCAL_CFLAGS += -Wall -Wextra -Werror
 
 LOCAL_SHARED_LIBRARIES:= \
-         libcutils libdl libmmcamera_interface
+         libcutils libdl libmmcamera_interface liblog
 
 LOCAL_MODULE_TAGS := optional
 
@@ -198,7 +198,7 @@ endif
 LOCAL_CFLAGS += -Wall -Wextra -Werror
 
 LOCAL_SHARED_LIBRARIES:= \
-         libcutils libdl libmmcamera_interface
+         libcutils libdl libmmcamera_interface liblog
 
 LOCAL_MODULE_TAGS := optional
 

diff --git a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
@@ -37,7 +37,7 @@ LOCAL_SRC_FILES := mm_jpeg_test.c
 LOCAL_MODULE           := mm-jpeg-interface-test
 LOCAL_32_BIT_ONLY := true
 LOCAL_PRELINK_MODULE   := false
-LOCAL_SHARED_LIBRARIES := libcutils libdl libmmjpeg_interface
+LOCAL_SHARED_LIBRARIES := libcutils libdl libmmjpeg_interface liblog
 
 include $(BUILD_EXECUTABLE)
 
@@ -81,7 +81,7 @@ LOCAL_SRC_FILES := mm_jpegdec_test.c
 LOCAL_MODULE           := mm-jpegdec-interface-test
 LOCAL_32_BIT_ONLY := true
 LOCAL_PRELINK_MODULE   := false
-LOCAL_SHARED_LIBRARIES := libcutils libdl libmmjpeg_interface
+LOCAL_SHARED_LIBRARIES := libcutils libdl libmmjpeg_interface liblog
 
 include $(BUILD_EXECUTABLE)
 

diff --git a/camera/mm-image-codec/qomx_core/Android.mk b/camera/mm-image-codec/qomx_core/Android.mk
@@ -23,6 +23,6 @@ LOCAL_SRC_FILES := qomx_core.c
 LOCAL_MODULE           := libqomx_core
 LOCAL_32_BIT_ONLY := true
 LOCAL_PRELINK_MODULE   := false
-LOCAL_SHARED_LIBRARIES := libcutils libdl
+LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
 
 include $(BUILD_SHARED_LIBRARY)