Replacing copy headers with header only lib
Bug: 33241851
Test: build sailfish and pass cts-camera
Change-Id: I189a533d25393bdeb8ccf361200cbac80e4ef573
diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk
index fab29b2..8fd78e7 100644
--- a/camera/QCamera2/stack/mm-camera-interface/Android.mk
+++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk
@@ -33,11 +33,6 @@
endif
LOCAL_CFLAGS += -D_ANDROID_ -DQCAMERA_REDEFINE_LOG
-LOCAL_COPY_HEADERS_TO := mm-camera-interface
-LOCAL_COPY_HEADERS += ../common/cam_intf.h
-LOCAL_COPY_HEADERS += ../common/cam_types.h
-LOCAL_COPY_HEADERS += ../common/cam_cond.h
-LOCAL_COPY_HEADERS += ../common/cam_semaphore.h
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/inc \
@@ -67,4 +62,9 @@
LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY)
include $(BUILD_SHARED_LIBRARY)
+include $(CLEAR_VARS)
+LOCAL_MODULE := libmmcamera_interface_headers
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
+include $(BUILD_HEADER_LIBRARY)
+
LOCAL_PATH := $(OLD_LOCAL_PATH)
diff --git a/camera/QCamera2/stack/mm-camera-interface/include/cam_cond.h b/camera/QCamera2/stack/mm-camera-interface/include/cam_cond.h
new file mode 120000
index 0000000..001cd44
--- /dev/null
+++ b/camera/QCamera2/stack/mm-camera-interface/include/cam_cond.h
@@ -0,0 +1 @@
+../../common/cam_cond.h
\ No newline at end of file
diff --git a/camera/QCamera2/stack/mm-camera-interface/include/cam_intf.h b/camera/QCamera2/stack/mm-camera-interface/include/cam_intf.h
new file mode 120000
index 0000000..02830c7
--- /dev/null
+++ b/camera/QCamera2/stack/mm-camera-interface/include/cam_intf.h
@@ -0,0 +1 @@
+../../common/cam_intf.h
\ No newline at end of file
diff --git a/camera/QCamera2/stack/mm-camera-interface/include/cam_semaphore.h b/camera/QCamera2/stack/mm-camera-interface/include/cam_semaphore.h
new file mode 120000
index 0000000..724f03e
--- /dev/null
+++ b/camera/QCamera2/stack/mm-camera-interface/include/cam_semaphore.h
@@ -0,0 +1 @@
+../../common/cam_semaphore.h
\ No newline at end of file
diff --git a/camera/QCamera2/stack/mm-camera-interface/include/cam_types.h b/camera/QCamera2/stack/mm-camera-interface/include/cam_types.h
new file mode 120000
index 0000000..ea81ed2
--- /dev/null
+++ b/camera/QCamera2/stack/mm-camera-interface/include/cam_types.h
@@ -0,0 +1 @@
+../../common/cam_types.h
\ No newline at end of file
