From 89d7a112547f55292e1dd99c61c022ff6669cd0a Mon Sep 17 00:00:00 2001 From: Sauhard Pande Date: Mon, 3 Apr 2017 19:24:59 +0530 Subject: msm8996-common: camera: Vendor Seperation Moving camera hal and mm-interface binaries to /system/vendor/lib Change-Id: Ic639b698a8bf4418d51409342ab8f1187362a99b --- camera/QCamera2/stack/mm-camera-interface/Android.mk | 1 + camera/QCamera2/stack/mm-jpeg-interface/Android.mk | 1 + camera/QCamera2/stack/mm-lib2d-interface/Android.mk | 1 + 3 files changed, 3 insertions(+) (limited to 'camera/QCamera2/stack') diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk index 169c1cf..a928805 100644 --- a/camera/QCamera2/stack/mm-camera-interface/Android.mk +++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk @@ -56,6 +56,7 @@ LOCAL_MODULE := libmmcamera_interface LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libdl libcutils liblog LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) diff --git a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk index 175796b..cba41d8 100644 --- a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk +++ b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk @@ -75,6 +75,7 @@ ifeq ($(strip $(LIB2D_ROTATION)),true) LOCAL_SHARED_LIBRARIES += libmmlib2d_interface endif LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) diff --git a/camera/QCamera2/stack/mm-lib2d-interface/Android.mk b/camera/QCamera2/stack/mm-lib2d-interface/Android.mk index 696f04a..4d3d31d 100644 --- a/camera/QCamera2/stack/mm-lib2d-interface/Android.mk +++ b/camera/QCamera2/stack/mm-lib2d-interface/Android.mk @@ -32,6 +32,7 @@ LOCAL_MODULE := libmmlib2d_interface LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libdl libcutils liblog libmmcamera_interface LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) -- cgit v1.2.3 From 2bfb61bf2a3a92d9fccdcc0d8bd65c6a9e8cbe8b Mon Sep 17 00:00:00 2001 From: Suman Mukherjee Date: Thu, 6 Jul 2017 16:01:18 +0530 Subject: msm8996-common: camera: Added LOCAL_VENDOR_MODULE to set output path of the binaries Replaced LOCAL_PROPRIETARY_MODULE with LOCAL_VENDOR_MODULE to set the output vendor path for hal binaries and libraries Change-Id: Ib04d80eabc0e17f3863e956db5f2378e426c0687 --- camera/QCamera2/stack/mm-camera-interface/Android.mk | 2 +- camera/QCamera2/stack/mm-jpeg-interface/Android.mk | 2 +- camera/QCamera2/stack/mm-lib2d-interface/Android.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'camera/QCamera2/stack') diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk index a928805..22e4509 100644 --- a/camera/QCamera2/stack/mm-camera-interface/Android.mk +++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk @@ -56,7 +56,7 @@ LOCAL_MODULE := libmmcamera_interface LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libdl libcutils liblog LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_VENDOR_MODULE := true LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) diff --git a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk index cba41d8..8dd448d 100644 --- a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk +++ b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk @@ -75,7 +75,7 @@ ifeq ($(strip $(LIB2D_ROTATION)),true) LOCAL_SHARED_LIBRARIES += libmmlib2d_interface endif LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_VENDOR_MODULE := true LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) diff --git a/camera/QCamera2/stack/mm-lib2d-interface/Android.mk b/camera/QCamera2/stack/mm-lib2d-interface/Android.mk index 4d3d31d..e963b69 100644 --- a/camera/QCamera2/stack/mm-lib2d-interface/Android.mk +++ b/camera/QCamera2/stack/mm-lib2d-interface/Android.mk @@ -32,7 +32,7 @@ LOCAL_MODULE := libmmlib2d_interface LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libdl libcutils liblog libmmcamera_interface LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_VENDOR_MODULE := true LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) -- cgit v1.2.3 From 8b6e07b0d8f9ee71a4672cc94a3d607b42ad02fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Thu, 1 Mar 2018 22:35:14 +0100 Subject: msm8996-common: Don't build camera HAL test code. --- camera/QCamera2/stack/Android.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'camera/QCamera2/stack') diff --git a/camera/QCamera2/stack/Android.mk b/camera/QCamera2/stack/Android.mk index a357417..bd1c3e6 100644 --- a/camera/QCamera2/stack/Android.mk +++ b/camera/QCamera2/stack/Android.mk @@ -1,5 +1,3 @@ LOCAL_PATH:= $(call my-dir) include $(LOCAL_PATH)/mm-camera-interface/Android.mk include $(LOCAL_PATH)/mm-jpeg-interface/Android.mk -include $(LOCAL_PATH)/mm-jpeg-interface/test/Android.mk -include $(LOCAL_PATH)/mm-camera-test/Android.mk -- cgit v1.2.3