tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE": DO NOT MERGE

Browse source 
This reverts commit 4ac84a428d.
This commit is contained in:
Igor Murashkin 2013-01-30 16:33:31 -08:00
parent 2dc781d20e
commit 803a8c76c5
2 changed files with 1 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/camera2/Android.mk
View file

@ -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

28
tests/camera2/FutureMetadata.h
View file

@ -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