From 52f92faa60d4e5300e194e6ded3d290fcf4df241 Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Thu, 10 Jan 2013 11:28:16 -0800 Subject: [PATCH] Camera2: Selectively re-define master metadata symbols: DO NOT MERGE Change-Id: I0d8637362f407dc2e2809d5800c9667f3c15260b --- .../system/camera/EmulatedFakeCamera2.cpp | 1 + tools/emulator/system/camera/FutureMetadata.h | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 tools/emulator/system/camera/FutureMetadata.h diff --git a/tools/emulator/system/camera/EmulatedFakeCamera2.cpp b/tools/emulator/system/camera/EmulatedFakeCamera2.cpp index 4e4ee548d..bc293d77b 100644 --- a/tools/emulator/system/camera/EmulatedFakeCamera2.cpp +++ b/tools/emulator/system/camera/EmulatedFakeCamera2.cpp @@ -28,6 +28,7 @@ #include #include #include "gralloc_cb.h" +#include "FutureMetadata.h" namespace android { diff --git a/tools/emulator/system/camera/FutureMetadata.h b/tools/emulator/system/camera/FutureMetadata.h new file mode 100644 index 000000000..76fd5136e --- /dev/null +++ b/tools/emulator/system/camera/FutureMetadata.h @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * Rename select master metadata 2.0 symbols to metadata symbols in jb-mr1-dev + * - this avoids having to bring in cross-repo changes + */ + +#ifndef HW_EMULATOR_CAMERA_FUTURE_METADATA_H +#define HW_EMULATOR_CAMERA_FUTURE_METADATA_H + +#define ANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE ANDROID_SENSOR_EXPOSURE_TIME_RANGE +#define ANDROID_CONTROL_MODE_OFF ANDROID_CONTROL_OFF +#define ANDROID_CONTROL_EFFECT_MODE_OFF ANDROID_CONTROL_EFFECT_OFF +#define ANDROID_CONTROL_AF_MODE_OFF ANDROID_CONTROL_AF_OFF +#define ANDROID_CONTROL_AE_MODE_OFF ANDROID_CONTROL_AE_OFF +#define ANDROID_CONTROL_AWB_MODE_OFF ANDROID_CONTROL_AWB_OFF + +#endif