commit e2a9a012960293c5bbcb4b6c3a6f4807ab99000b
author Ari Hausman-Cohen <arihc@google.com> Mon Aug 15 16:41:27 2016 -0700
committer Ari Hausman-Cohen <arihc@google.com> Tue Aug 16 18:20:35 2016 -0700
tree da501f2ff33154fb65ce6b0697781b3eb0a50f2c
parent 8c13aaf1ac713542a533a755fcc562d666f2221c

Add menu and slider options.

ControlOptionsInterfaces for lists and ranges.

BUG: 30140438
TEST: unit tests pass
Change-Id: I7bcb63777600cff18347c8eae54112025b6556b3

modules/camera/3_4/Android.mk

diff --git a/modules/camera/3_4/Android.mk b/modules/camera/3_4/Android.mk
index 820a993..90dcc97 100644
--- a/modules/camera/3_4/Android.mk
+++ b/modules/camera/3_4/Android.mk
@@ -56,9 +56,11 @@
   metadata/fixed_property_test.cpp \
   metadata/ignored_control_test.cpp \
   metadata/map_converter_test.cpp \
+  metadata/menu_control_options_test.cpp \
   metadata/metadata_test.cpp \
   metadata/optioned_control_test.cpp \
   metadata/ranged_converter_test.cpp \
+  metadata/slider_control_options_test.cpp \
   metadata/v4l2_enum_control_test.cpp \
 
 # V4L2 Camera HAL.