commit 5b7968ce61f6193cb293037b2e224d95c5ef4520
author Ari Hausman-Cohen <arihc@google.com> Tue Aug 02 11:30:53 2016 -0700
committer Ari Hausman-Cohen <arihc@google.com> Thu Aug 04 18:47:09 2016 -0700
tree d39570e52dc31f73937dcf4469e4920f27ffb972
parent 6c63b50e3a7195599117d9b46512e957e19fb635

Add abstract optioned control class.

An optioned control is a control with a fixed list of
accepted options.

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

modules/camera/3_4/Android.mk

diff --git a/modules/camera/3_4/Android.mk b/modules/camera/3_4/Android.mk
index 63e7c1a..01574b9 100644
--- a/modules/camera/3_4/Android.mk
+++ b/modules/camera/3_4/Android.mk
@@ -52,6 +52,7 @@
   metadata/control_test.cpp \
   metadata/fixed_property_test.cpp \
   metadata/metadata_test.cpp \
+  metadata/optioned_control_test.cpp \
 
 # V4L2 Camera HAL.
 # ==============================================================================
@@ -60,7 +61,10 @@
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_CFLAGS += $(v4l2_cflags)
 LOCAL_SHARED_LIBRARIES := $(v4l2_shared_libs)
-LOCAL_STATIC_LIBRARIES := $(v4l2_static_libs)
+LOCAL_STATIC_LIBRARIES := \
+  libgtest_prod \
+  $(v4l2_static_libs) \
+
 LOCAL_C_INCLUDES += $(v4l2_c_includes)
 LOCAL_SRC_FILES := $(v4l2_src_files)
 include $(BUILD_SHARED_LIBRARY)