diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2014-05-03 00:29:04 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-03 00:29:04 +0000 |
commit | fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9 (patch) | |
tree | 8c35d32339aef06d77648a8fa7961d058e8356f9 /camera/Android.mk | |
parent | 6c516d800d97b7f25a22574998cb055c9d7f7b16 (diff) | |
parent | 6770260f83f5576b041b7b3a2536d082a631f9b0 (diff) | |
download | frameworks_av-fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9.zip frameworks_av-fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9.tar.gz frameworks_av-fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9.tar.bz2 |
Merge "Revert "camera3: Update CameraMetadata vendor tag handling.""
Diffstat (limited to 'camera/Android.mk')
-rw-r--r-- | camera/Android.mk | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index 18800b4..5774b6f 100644 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -52,11 +52,6 @@ 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 include $(BUILD_SHARED_LIBRARY) |