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/Android.mk | 2 +- 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 +- camera/mm-image-codec/qomx_core/Android.mk | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) (limited to 'camera') diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index 358b04d..2487561 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -116,7 +116,7 @@ LOCAL_STATIC_LIBRARIES := android.hardware.camera.common@1.0-helper LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM) -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) 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) diff --git a/camera/mm-image-codec/qomx_core/Android.mk b/camera/mm-image-codec/qomx_core/Android.mk index c4edfc4..9f46202 100644 --- a/camera/mm-image-codec/qomx_core/Android.mk +++ b/camera/mm-image-codec/qomx_core/Android.mk @@ -20,6 +20,7 @@ LOCAL_SRC_FILES := qomx_core.c LOCAL_MODULE := libqomx_core LOCAL_PRELINK_MODULE := false +LOCAL_VENDOR_MODULE := true LOCAL_SHARED_LIBRARIES := libcutils libdl liblog LOCAL_32_BIT_ONLY := true -- cgit v1.2.3