From 2d24cb0bbbf4652b21b4be9ef4872d0781ad140b Mon Sep 17 00:00:00 2001 From: Deokgyu Yang Date: Thu, 20 May 2021 12:23:29 +0900 Subject: [PATCH] gts3l: shims: Rename camera things to be commonized as of libcameraclient_shim Signed-off-by: Deokgyu Yang Change-Id: Id86c0c4129ad93a18bf865ca842edf5c6cdf3d98 --- BoardConfig.mk | 2 +- device.mk | 2 +- shims/{libshims_cameraclient => libcameraclient}/Android.mk | 4 ++-- .../libcameraclient.cpp} | 2 +- .../libcameraclient.h} | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename shims/{libshims_cameraclient => libcameraclient}/Android.mk (90%) rename shims/{libshims_cameraclient/camera_cameraclient.cpp => libcameraclient/libcameraclient.cpp} (99%) rename shims/{libshims_cameraclient/camera_cameraclient.h => libcameraclient/libcameraclient.h} (100%) diff --git a/BoardConfig.mk b/BoardConfig.mk index 95e5f25..aa29646 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -215,7 +215,7 @@ BOARD_HAVE_SAMSUNG_WIFI := true TARGET_LD_SHIM_LIBS := \ /vendor/lib/libbauthserver.so|libbauthtzcommon_shim.so \ /vendor/lib64/libbauthserver.so|libbauthtzcommon_shim.so \ - /vendor/lib/hw/camera.msm8996.so|/vendor/lib/libshims_cameraclient.so + /vendor/lib/hw/camera.msm8996.so|/vendor/lib/libcameraclient_shim.so # inherit from the proprietary version -include vendor/samsung/gts3llte/BoardConfigVendor.mk diff --git a/device.mk b/device.mk index a058efb..e51340b 100755 --- a/device.mk +++ b/device.mk @@ -146,7 +146,7 @@ PRODUCT_PACKAGES += \ camera.device@3.2-impl \ camera.device@3.3-impl \ camera.device@3.4-impl \ - libshims_cameraclient \ + libcameraclient_shim \ Snap # Connectivity Engine support (CNE) diff --git a/shims/libshims_cameraclient/Android.mk b/shims/libcameraclient/Android.mk similarity index 90% rename from shims/libshims_cameraclient/Android.mk rename to shims/libcameraclient/Android.mk index 568ebbd..09d4e22 100644 --- a/shims/libshims_cameraclient/Android.mk +++ b/shims/libcameraclient/Android.mk @@ -16,9 +16,9 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_SRC_FILES := camera_cameraclient.cpp +LOCAL_SRC_FILES := libcameraclient.cpp -LOCAL_MODULE := libshims_cameraclient +LOCAL_MODULE := libcameraclient_shim LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_VENDOR_MODULE := true diff --git a/shims/libshims_cameraclient/camera_cameraclient.cpp b/shims/libcameraclient/libcameraclient.cpp similarity index 99% rename from shims/libshims_cameraclient/camera_cameraclient.cpp rename to shims/libcameraclient/libcameraclient.cpp index 4623ed6..d4cf71f 100644 --- a/shims/libshims_cameraclient/camera_cameraclient.cpp +++ b/shims/libcameraclient/libcameraclient.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "camera_cameraclient.h" +#include "libcameraclient.h" namespace android { diff --git a/shims/libshims_cameraclient/camera_cameraclient.h b/shims/libcameraclient/libcameraclient.h similarity index 100% rename from shims/libshims_cameraclient/camera_cameraclient.h rename to shims/libcameraclient/libcameraclient.h