diff options
Diffstat (limited to 'camera/Android.mk')
-rw-r--r-- | camera/Android.mk | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index 5cedab0..18800b4 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) @@ -8,7 +22,7 @@ LOCAL_SRC_FILES:= \ Camera.cpp \ CameraMetadata.cpp \ CameraParameters.cpp \ - CameraParameters2.cpp \ + CaptureResult.cpp \ ICamera.cpp \ ICameraClient.cpp \ ICameraService.cpp \ @@ -22,6 +36,7 @@ LOCAL_SRC_FILES:= \ camera2/CaptureRequest.cpp \ ProCamera.cpp \ CameraBase.cpp \ + VendorTagDescriptor.cpp LOCAL_SHARED_LIBRARIES := \ libcutils \ @@ -35,6 +50,12 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_C_INCLUDES += \ system/media/camera/include \ + system/media/private/camera/include + +## Enable asserts for 'eng' builds +ifeq ($(TARGET_BUILD_VARIANT),eng) +LOCAL_CFLAGS += -UNDEBUG +endif LOCAL_MODULE:= libcamera_client |