diff options
| author | Yifan Hong <elsk@google.com> | 2021-04-28 22:12:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:12:03 +0000 |
| commit | b562c5633ec338acb3e924ad66ebfebf4891c54d (patch) | |
| tree | 49e2f45f94ca7da7922c2eb49cac73c5b5a7123b | |
| parent | 41628fee87da7d6dc90c8187700567bffd94a24b (diff) | |
| parent | 09df2e2c96d78e67dd3a268c1b4c038dc882df03 (diff) | |
| download | libhardware-b562c5633ec338acb3e924ad66ebfebf4891c54d.tar.gz | |
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
| -rw-r--r-- | modules/camera/3_4/Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/camera/3_4/Android.mk b/modules/camera/3_4/Android.mk index 7c8eee16..aa230977 100644 --- a/modules/camera/3_4/Android.mk +++ b/modules/camera/3_4/Android.mk @@ -94,9 +94,8 @@ LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE 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) |