diff options
| author | dd3boh <dade.garberi@gmail.com> | 2017-09-25 22:24:22 +0200 |
|---|---|---|
| committer | dd3boh <dade.garberi@gmail.com> | 2017-10-31 12:34:43 +0100 |
| commit | 84307a2a8395e1398c315877e68d2b5553a911d0 (patch) | |
| tree | 8c57887f545291592759fbf3de4c46c947cdfb96 /camera | |
| parent | 3436cf7ae9bd7c48d20073e39f99b54747b09c44 (diff) | |
z2_plus: Rename services so that it doesn't create problems when both z2_plus and z2_row device trees are there
Signed-off-by: dd3boh <dade.garberi@gmail.com>
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/Android.bp | 2 | ||||
| -rw-r--r-- | camera/provider/Android.bp | 5 | ||||
| -rw-r--r-- | camera/provider/CameraProvider.cpp | 2 | ||||
| -rw-r--r-- | camera/z2_plus/Android.bp (renamed from camera/zuk/Android.bp) | 3 | ||||
| -rw-r--r-- | camera/z2_plus/CameraDevice.cpp (renamed from camera/zuk/CameraDevice.cpp) | 2 | ||||
| -rw-r--r-- | camera/z2_plus/CameraDevice_1_0.h (renamed from camera/zuk/CameraDevice_1_0.h) | 0 |
6 files changed, 8 insertions, 6 deletions
diff --git a/camera/Android.bp b/camera/Android.bp index 079e48b..da6c0ff 100644 --- a/camera/Android.bp +++ b/camera/Android.bp @@ -1,4 +1,4 @@ subdirs = [ - "zuk", + "z2_plus", "provider", ] diff --git a/camera/provider/Android.bp b/camera/provider/Android.bp index 5261010..326c639 100644 --- a/camera/provider/Android.bp +++ b/camera/provider/Android.bp @@ -1,5 +1,6 @@ cc_library_shared { - name: "android.hardware.camera.provider@2.4-impl.zuk", + name: "android.hardware.camera.provider@2.4-impl.z2_plus", + defaults: ["hidl_z2_plus"], proprietary: true, relative_install_path: "hw", srcs: ["CameraProvider.cpp"], @@ -10,7 +11,7 @@ cc_library_shared { "libcutils", "android.hardware.camera.device@1.0", "android.hardware.camera.device@3.2", - "camera.device@1.0-impl.zuk", + "camera.device@1.0-impl.z2_plus", "camera.device@3.2-impl", "android.hardware.camera.provider@2.4", "android.hardware.camera.common@1.0", diff --git a/camera/provider/CameraProvider.cpp b/camera/provider/CameraProvider.cpp index 3245189..e6e03d8 100644 --- a/camera/provider/CameraProvider.cpp +++ b/camera/provider/CameraProvider.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "CamProvider@2.4-impl.zuk" +#define LOG_TAG "CamProvider@2.4-impl.z2_plus" #include <android/log.h> #include "CameraProvider.h" diff --git a/camera/zuk/Android.bp b/camera/z2_plus/Android.bp index a2cbd40..a086d31 100644 --- a/camera/zuk/Android.bp +++ b/camera/z2_plus/Android.bp @@ -1,5 +1,6 @@ cc_library_shared { - name: "camera.device@1.0-impl.zuk", + name: "camera.device@1.0-impl.z2_plus", + defaults: ["hidl_z2_plus"], proprietary: true, srcs: [ "CameraDevice.cpp", diff --git a/camera/zuk/CameraDevice.cpp b/camera/z2_plus/CameraDevice.cpp index 02c1b02..5770b10 100644 --- a/camera/zuk/CameraDevice.cpp +++ b/camera/z2_plus/CameraDevice.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "CamDev@1.0-impl.zuk" +#define LOG_TAG "CamDev@1.0-impl.z2_plus" #include <hardware/camera.h> #include <hardware/gralloc1.h> #include <hidlmemory/mapping.h> diff --git a/camera/zuk/CameraDevice_1_0.h b/camera/z2_plus/CameraDevice_1_0.h index c078596..c078596 100644 --- a/camera/zuk/CameraDevice_1_0.h +++ b/camera/z2_plus/CameraDevice_1_0.h |