am 6daf70b2: Merge "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE" into jb-mr1-aah-dev

* commit '6daf70b26bfddf9ad079b925c0d586b789e3c207':
  Camera2: Selectively re-define master metadata symbols: DO NOT MERGE

tools/emulator/system/camera/EmulatedFakeCamera2.cpp

@@ -28,6 +28,7 @@
 #include <ui/Rect.h>
 #include <ui/GraphicBufferMapper.h>
 #include "gralloc_cb.h"
+#include "FutureMetadata.h"
 
 namespace android {
 

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