Merge tag 'android-m-preview-2'

Android m preview 2

Change-Id: Ib852580dce3fd4af91cf402be6fdc83b5f8d8f85

diff --git a/Android.mk b/Android.mk
index f279e336b52b7617918cc5d15a0d0d45334cfa4c..b6b074f3e9b8dbd873ab8fc16d4b4ec1aba09b86 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -16,6 +16,7 @@
 #
 
 ifeq ($(TARGET_BOARD_PLATFORM),exynos5)
+ifeq ($(TARGET_SLSI_VARIANT),)
 
 exynos5_dirs := \
        libion_exynos \
@@ -61,3 +62,4 @@ USE_HWC_CSC_THREAD := true
 include $(call all-named-subdir-makefiles,$(exynos5_dirs))
 
 endif
+endif

diff --git a/gralloc/gralloc.cpp b/gralloc/gralloc.cpp
index b5f269bf242be4d31fa40cd1bb914956cb801aac..d48acab047cf10544824ff652cab10fd4e489b58 100644 (file)
--- a/gralloc/gralloc.cpp
+++ b/gralloc/gralloc.cpp
@@ -48,6 +48,17 @@
 #define MB_1 (1024*1024)
 
 
+
+//these are no longer defined, but we DO support them, so let's keep that knowledge alive for potential binary-blob users
+#define HAL_PIXEL_FORMAT_sRGB_A_8888   12
+#define HAL_PIXEL_FORMAT_sRGB_X_8888   13
+
+
+
+
+
+
+
 /*****************************************************************************/
 
 struct gralloc_context_t {
@@ -160,7 +171,7 @@ static int gralloc_alloc_rgb(int ionfd, int w, int h, int format, int usage,
             bpp = 3;
             break;
         case HAL_PIXEL_FORMAT_RGB_565:
-        case HAL_PIXEL_FORMAT_RAW_SENSOR:
+        case HAL_PIXEL_FORMAT_RAW16:
             bpp = 2;
             break;
         case HAL_PIXEL_FORMAT_BLOB:

diff --git a/libcamera2/ExynosCamera2.cpp b/libcamera2/ExynosCamera2.cpp
index 35bb9f518d6f772a492c07662ef31e72d71a0725..e06f670604f6f193b25348ccd70c2f6f155420a0 100644 (file)
--- a/libcamera2/ExynosCamera2.cpp
+++ b/libcamera2/ExynosCamera2.cpp
@@ -105,7 +105,7 @@ const nsecs_t Sensor::kFrameDurationRange[2] =
 const uint8_t Sensor::kColorFilterArrangement = ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_RGGB;
 
 const uint32_t kAvailableFormats[5] = {
-        HAL_PIXEL_FORMAT_RAW_SENSOR,
+        HAL_PIXEL_FORMAT_RAW16,
         HAL_PIXEL_FORMAT_BLOB,
         HAL_PIXEL_FORMAT_RGBA_8888,
         HAL_PIXEL_FORMAT_YV12,

diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp
index fa6c8d39c62ce4531e62600327c76ceac17890e4..0bc8aa460b084dec4877694f4146b9b7a8ca53af 100644 (file)
--- a/libcamera2/ExynosCameraHWInterface2.cpp
+++ b/libcamera2/ExynosCameraHWInterface2.cpp
@@ -6494,28 +6494,22 @@ done:
 
 
 static hw_module_methods_t camera_module_methods = {
-            open : HAL2_camera_device_open
+            .open = HAL2_camera_device_open
 };
 
 extern "C" {
     struct camera_module HAL_MODULE_INFO_SYM = {
-      common : {
-          tag                : HARDWARE_MODULE_TAG,
-          module_api_version : CAMERA_MODULE_API_VERSION_2_0,
-          hal_api_version    : HARDWARE_HAL_API_VERSION,
-          id                 : CAMERA_HARDWARE_MODULE_ID,
-          name               : "Exynos Camera HAL2",
-          author             : "Samsung Corporation",
-          methods            : &camera_module_methods,
-          dso                : NULL,
-          reserved           : {0},
+      .common = {
+          .tag                = HARDWARE_MODULE_TAG,
+          .module_api_version = CAMERA_MODULE_API_VERSION_2_0,
+          .hal_api_version    = HARDWARE_HAL_API_VERSION,
+          .id                 = CAMERA_HARDWARE_MODULE_ID,
+          .name               = "Exynos Camera HAL2",
+          .author             = "Samsung Corporation",
+          .methods            = &camera_module_methods,
       },
-      get_number_of_cameras : HAL2_getNumberOfCameras,
-      get_camera_info       : HAL2_getCameraInfo,
-      set_callbacks         : NULL,
-      get_vendor_tag_ops    : NULL,
-      open_legacy           : NULL,
-      reserved              : {0}
+      .get_number_of_cameras = HAL2_getNumberOfCameras,
+      .get_camera_info       = HAL2_getCameraInfo,
     };
 }
 

diff --git a/libcsc/csc.c b/libcsc/csc.c
index f16502acad6d5dca4a77d5042a58e62a9eeeaefd..d619641e984f5e13d63832a97582da67629e1e49 100644 (file)
--- a/libcsc/csc.c
+++ b/libcsc/csc.c
@@ -29,6 +29,7 @@
  */
 #define LOG_TAG "libcsc"
 #include <cutils/log.h>
+#include <errno.h>
 
 #include <errno.h>
 #include <stdio.h>

diff --git a/mobicore/daemon/Daemon/Server/NetlinkServer.cpp b/mobicore/daemon/Daemon/Server/NetlinkServer.cpp
index 73d08c4d7078bbd67fe6bcc3545b1161dd78746d..a91af10086b2a22082d4f1a8ab67a5e5280c5fff 100644 (file)
--- a/mobicore/daemon/Daemon/Server/NetlinkServer.cpp
+++ b/mobicore/daemon/Daemon/Server/NetlinkServer.cpp
@@ -72,7 +72,7 @@ void NetlinkServer::run(
         struct nlmsghdr *nlh = NULL;
         struct iovec iov;
         struct msghdr msg;
-        uint32_t len;
+        int32_t len;
 
         memset(&src_addr, 0, sizeof(src_addr));
         src_addr.nl_family = AF_NETLINK;