diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-02-21 10:51:38 -0800 |
|---|---|---|
| committer | Ruben Brunk <rubenbrunk@google.com> | 2014-03-13 12:09:22 -0700 |
| commit | d1176ef16677b6c94fb893edb6a864cdccc0b190 (patch) | |
| tree | 8cc18e17c4e32633d20e8c2b7fc9e397cc1791ac /camera/Android.mk | |
| parent | 3a005b3b19b750afe24577ae322aff4602ca2740 (diff) | |
| download | frameworks_av-d1176ef16677b6c94fb893edb6a864cdccc0b190.zip frameworks_av-d1176ef16677b6c94fb893edb6a864cdccc0b190.tar.gz frameworks_av-d1176ef16677b6c94fb893edb6a864cdccc0b190.tar.bz2 | |
camera3: Pass vendor tags through binder.
Bug: 12134423
- Adds a class for parceling vendor tag definitions.
- Passes vendor tag definitions to clients of the camera service.
- Switches over to new vendor tag mechanism when reading from HAL.
Change-Id: Icef3fe9e67160767bdb8244ac49c85b68b497123
Diffstat (limited to 'camera/Android.mk')
| -rw-r--r-- | camera/Android.mk | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index e633450..369d0c5 100644 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -1,3 +1,17 @@ +# Copyright 2010 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. + CAMERA_CLIENT_LOCAL_PATH:= $(call my-dir) include $(call all-subdir-makefiles) include $(CLEAR_VARS) @@ -21,6 +35,7 @@ LOCAL_SRC_FILES:= \ camera2/CaptureRequest.cpp \ ProCamera.cpp \ CameraBase.cpp \ + VendorTagDescriptor.cpp LOCAL_SHARED_LIBRARIES := \ libcutils \ @@ -34,6 +49,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_C_INCLUDES += \ system/media/camera/include \ + system/media/private/camera/include LOCAL_MODULE:= libcamera_client |