diff options
| author | Ethan Chen <intervigil@gmail.com> | 2015-10-28 16:30:51 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2015-11-07 01:37:03 -0800 |
| commit | eb18dd6921c6805a9f795af6a981fc83bb8e3e07 (patch) | |
| tree | ee8c5a0ca2455a3b677405b74ab806b23fbe8efb /camera | |
| parent | 6652c2586368bfaf14799b06be4eb91d5d21fed9 (diff) | |
| download | frameworks_av-eb18dd6921c6805a9f795af6a981fc83bb8e3e07.zip frameworks_av-eb18dd6921c6805a9f795af6a981fc83bb8e3e07.tar.gz frameworks_av-eb18dd6921c6805a9f795af6a981fc83bb8e3e07.tar.bz2 | |
camera: Allow devices to load custom CameraParameter code
* Some devices need additional code to load their cameras. Add a hook
for extra classes and symbols to be included.
Change-Id: Ifbe79e25b7ab47c5d468f5179032a4283b3f0df5
(cherry picked from commit 38681625992c0029d32eec98fc7e89d71b855b0e)
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/Android.mk | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index 471cb0d..36f6da1 100644 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -21,7 +21,6 @@ LOCAL_PATH := $(CAMERA_CLIENT_LOCAL_PATH) LOCAL_SRC_FILES:= \ Camera.cpp \ CameraMetadata.cpp \ - CameraParameters.cpp \ CaptureResult.cpp \ CameraParameters2.cpp \ ICamera.cpp \ @@ -53,6 +52,21 @@ LOCAL_C_INCLUDES += \ system/media/camera/include \ system/media/private/camera/include \ +ifneq ($(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY),) +LOCAL_WHOLE_STATIC_LIBRARIES += $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY) +else +LOCAL_WHOLE_STATIC_LIBRARIES += libcamera_parameters +endif + LOCAL_MODULE:= libcamera_client include $(BUILD_SHARED_LIBRARY) + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + CameraParameters.cpp + +LOCAL_MODULE := libcamera_parameters + +include $(BUILD_STATIC_LIBRARY) |