Merge "Use libgtest_prod_headers." am: 7749ef2a4a am: fc3c4d6cb4 am: 09df2e2c96

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1687225

Change-Id: I19e5fa41a24414e66153b8cf868c04f97983f330
diff --git a/modules/camera/3_4/Android.mk b/modules/camera/3_4/Android.mk
index 7c8eee1..aa23097 100644
--- a/modules/camera/3_4/Android.mk
+++ b/modules/camera/3_4/Android.mk
@@ -94,9 +94,8 @@
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_CFLAGS += $(v4l2_cflags)
 LOCAL_SHARED_LIBRARIES := $(v4l2_shared_libs)
-LOCAL_STATIC_LIBRARIES := \
-  libgtest_prod \
-  $(v4l2_static_libs) \
+LOCAL_HEADER_LIBRARIES := libgtest_prod_headers
+LOCAL_STATIC_LIBRARIES := $(v4l2_static_libs)
 
 LOCAL_C_INCLUDES += $(v4l2_c_includes)
 LOCAL_SRC_FILES := $(v4l2_src_files)