am 4ac84a42: Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE

* commit '4ac84a428d05ce7963f201df7ca308acb88fd8d8':
  Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE
This commit is contained in:
Igor Murashkin 2013-01-10 13:37:09 -08:00 committed by Android Git Automerger
commit 16e5a6440f
2 changed files with 29 additions and 1 deletions

View file

@ -36,7 +36,7 @@ LOCAL_C_INCLUDES += \
frameworks/av/services/camera/libcameraservice \
frameworks/native/include \
LOCAL_CFLAGS += -Wall -Wextra
LOCAL_CFLAGS += -Wall -Wextra -include FutureMetadata.h
LOCAL_MODULE:= camera2_test
LOCAL_MODULE_TAGS := tests

View file

@ -0,0 +1,28 @@
/*
* 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