Apply O fixes to the upgraded camera
BUG: 73313259
Test: Local build and boot of oc-gce-dev and oc-mr1-gce-dev
Change-Id: Ic94503a88587a268f6c563d36ea455b1604e1e1f
diff --git a/guest/hals/camera/Android.mk b/guest/hals/camera/Android.mk
index 1f690e7..ceaded9 100644
--- a/guest/hals/camera/Android.mk
+++ b/guest/hals/camera/Android.mk
@@ -50,9 +50,14 @@
emulator_camera_static_libraries += libjsoncpp
endif
-emulator_camera_static_libraries += \
- android.hardware.camera.common@1.0-helper \
- libyuv
+
+emulator_camera_static_libraries += android.hardware.camera.common@1.0-helper
+
+ifeq (0, $(shell test $(PLATFORM_SDK_VERSION) -le 26; echo $$?))
+emulator_camera_static_libraries += libyuv_static
+else
+emulator_camera_static_libraries += libyuv
+endif
emulator_camera_c_includes := \
device/google/cuttlefish_common \
diff --git a/guest/hals/camera/EmulatedBaseCamera.h b/guest/hals/camera/EmulatedBaseCamera.h
index 740f334..7b87589 100644
--- a/guest/hals/camera/EmulatedBaseCamera.h
+++ b/guest/hals/camera/EmulatedBaseCamera.h
@@ -21,9 +21,12 @@
#include <utils/Errors.h>
#include "CameraConfiguration.h"
#include "guest/libs/platform_support/api_level_fixes.h"
+#if VSOC_PLATFORM_SDK_BEFORE(O_MR1)
+#include <camera/CameraParameters.h>
+#else
#include <CameraParameters.h>
-
using ::android::hardware::camera::common::V1_0::helper::CameraParameters;
+#endif
namespace android {
diff --git a/guest/hals/camera/EmulatedCameraDevice.h b/guest/hals/camera/EmulatedCameraDevice.h
index ab654eb..a2db315 100644
--- a/guest/hals/camera/EmulatedCameraDevice.h
+++ b/guest/hals/camera/EmulatedCameraDevice.h
@@ -32,9 +32,14 @@
#include "Converters.h"
#include "EmulatedCameraCommon.h"
+#include "guest/libs/platform_support/api_level_fixes.h"
+#if VSOC_PLATFORM_SDK_BEFORE(O_MR1)
+#include <camera/CameraParameters.h>
+#else
#include <CameraParameters.h>
using ::android::hardware::camera::common::V1_0::helper::CameraParameters;
+#endif
namespace android {
diff --git a/guest/hals/camera/Exif.cpp b/guest/hals/camera/Exif.cpp
index afdcf4e..43dca52 100644
--- a/guest/hals/camera/Exif.cpp
+++ b/guest/hals/camera/Exif.cpp
@@ -22,10 +22,15 @@
#include <math.h>
#include <stdint.h>
+#include "guest/libs/platform_support/api_level_fixes.h"
+#if VSOC_PLATFORM_SDK_BEFORE(O_MR1)
+#include <camera/CameraParameters.h>
+#else
#include <CameraParameters.h>
using ::android::hardware::camera::common::V1_0::helper::CameraParameters;
using ::android::hardware::camera::common::V1_0::helper::Size;
+#endif
#include "Exif.h"
diff --git a/guest/hals/camera/Exif.h b/guest/hals/camera/Exif.h
index b4f0963..8e994e0 100644
--- a/guest/hals/camera/Exif.h
+++ b/guest/hals/camera/Exif.h
@@ -18,13 +18,18 @@
#ifndef CUTTLEFISH_CAMERA_EXIF_H
#define CUTTLEFISH_CAMERA_EXIF_H
+#include "guest/libs/platform_support/api_level_fixes.h"
+#if VSOC_PLATFORM_SDK_BEFORE(O_MR1)
+#include <camera/CameraParameters.h>
+#else
#include <CameraParameters.h>
+using ::android::hardware::camera::common::V1_0::helper::CameraParameters;
+#endif
+
struct _ExifData;
typedef struct _ExifData ExifData;
-using ::android::hardware::camera::common::V1_0::helper::CameraParameters;
-
namespace android {
/* Create an EXIF data structure based on camera parameters. This includes
