From 803a8c76c532f1548425fc1a3d3d9d04554b29f3 Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Wed, 30 Jan 2013 16:33:31 -0800 Subject: [PATCH] Revert "Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE": DO NOT MERGE This reverts commit 4ac84a428d05ce7963f201df7ca308acb88fd8d8. --- tests/camera2/Android.mk | 2 +- tests/camera2/FutureMetadata.h | 28 ---------------------------- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 tests/camera2/FutureMetadata.h diff --git a/tests/camera2/Android.mk b/tests/camera2/Android.mk index a13ca795..b3123286 100644 --- a/tests/camera2/Android.mk +++ b/tests/camera2/Android.mk @@ -38,7 +38,7 @@ LOCAL_C_INCLUDES += \ frameworks/av/services/camera/libcameraservice \ frameworks/native/include \ -LOCAL_CFLAGS += -Wall -Wextra -include FutureMetadata.h +LOCAL_CFLAGS += -Wall -Wextra LOCAL_MODULE:= camera2_test LOCAL_MODULE_TAGS := tests diff --git a/tests/camera2/FutureMetadata.h b/tests/camera2/FutureMetadata.h deleted file mode 100644 index 58ea6982..00000000 --- a/tests/camera2/FutureMetadata.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 __ANDROID_HAL_CAMERA2_TESTS_FUTURE_METADATA__ -#define __ANDROID_HAL_CAMERA2_TESTS_FUTURE_METADATA__ - -#define ANDROID_SENSOR_INFO_EXPOSURE_TIME_RANGE ANDROID_SENSOR_EXPOSURE_TIME_RANGE -#define ANDROID_CONTROL_MODE_OFF ANDROID_CONTROL_OFF - -#endif