commit 1f310199c39c8737a8e2cd4a0a2807922aa9a46a
author Jubeom Kim <jubeomk@nvidia.com> Mon Oct 17 20:45:50 2016 +0900
committer Keun-young Park <keunyoung@google.com> Tue Nov 29 01:48:16 2016 +0000
tree 759abf80ae14ca834af07e2da840b2393442099f
parent 946b59f7e6f929d8fe292084105b6a3b7e1bf745

Fix link error due to vehicle_camera_config_flag

When including vehicle_camera.h in multiple sources, there is an linker
error due to multiple definition of vehicle_camera_config_flag.

Bug 32272040

Change-Id: I1d1f9d2c4dc88d5217cb39003cb9be44c3748720
(cherry picked from commit 644a360cff7be804e167258c9d77b6f747096b8a)

include/hardware/vehicle_camera.h

diff --git a/include/hardware/vehicle_camera.h b/include/hardware/vehicle_camera.h
index 8075aee..c288796 100644
--- a/include/hardware/vehicle_camera.h
+++ b/include/hardware/vehicle_camera.h
@@ -68,7 +68,7 @@
 /**
  * Bitmask of features supported by a camera module
  */
-enum {
+typedef enum {
     VEHICLE_CAMERA_CONFIG_FLAG_ANDROID_OVERLAY_SUPPORT      = 0x1,
     VEHICLE_CAMERA_CONFIG_FLAG_CAMERA_CROP_SUPPORT          = 0x2,
     VEHICLE_CAMERA_CONFIG_FLAG_CAMERA_POSITIONING_SUPPORT   = 0x4
@@ -109,7 +109,7 @@
 typedef struct vehicle_camera_device_t {
     struct hw_device_t common;
 
-    const uint32_t camera_type;
+    uint32_t camera_type;
 
     /**
      * Returns the capabilities of this camera.