commit 87298e4dedc93a5e124bf7b51b250c0a95626a06
author Greg Hartman <ghartman@google.com> Mon Nov 06 09:55:15 2017 -0800
committer Ping-Hao Wu <pinghao@google.com> Mon Nov 06 10:12:39 2017 -0800
tree 71a2c8b444ea296d69c7811acd24feb1ec614d22
parent 89967468a10af48845340c95c46915e2ab6d426d

Reconciliation for oc-mr1 branch specific changes

Bug: 68802239
Bug: 68802303
Test: oc-mr1 local build successfully
Change-Id: I93d07bd9dfdc16ed5578b0984702e4321c4dd1c7

guest/hals/camera/fake-pipeline2/Base.h

diff --git a/guest/hals/camera/fake-pipeline2/Base.h b/guest/hals/camera/fake-pipeline2/Base.h
index 724b3f9..dfeeeca 100644
--- a/guest/hals/camera/fake-pipeline2/Base.h
+++ b/guest/hals/camera/fake-pipeline2/Base.h
@@ -22,7 +22,11 @@
 #ifndef HW_EMULATOR_CAMERA2_BASE_H
 #define HW_EMULATOR_CAMERA2_BASE_H
 
+#include "guest/libs/platform_support/api_level_fixes.h"
+
+#if VSOC_PLATFORM_SDK_BEFORE(O_MR1)
 #include <system/window.h>
+#endif
 #include <hardware/camera2.h>
 #include <utils/Vector.h>
 

guest/libs/platform_support/api_level_fixes.h

diff --git a/guest/libs/platform_support/api_level_fixes.h b/guest/libs/platform_support/api_level_fixes.h
index ec678aa..d0da546 100644
--- a/guest/libs/platform_support/api_level_fixes.h
+++ b/guest/libs/platform_support/api_level_fixes.h
@@ -62,7 +62,8 @@
 #define VSOC_PLATFORM_SDK_N                24
 #define VSOC_PLATFORM_SDK_N_MR1            25
 #define VSOC_PLATFORM_SDK_O                26
-#define VSOC_PLATFORM_SDK_LAST_SHIPPED     26
+#define VSOC_PLATFORM_SDK_O_MR1            27
+#define VSOC_PLATFORM_SDK_LAST_SHIPPED     27
 
 #define VSOC_PLATFORM_SDK_BEFORE(X) (VSOC_PLATFORM_SDK_VERSION < VSOC_PLATFORM_SDK_##X)
 #define VSOC_PLATFORM_SDK_AFTER(X) (VSOC_PLATFORM_SDK_VERSION > VSOC_PLATFORM_SDK_##X)