| commit | 0b38a6b7ae3a797bcd383119f9eedd6aa4df4bbf | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Wed Apr 19 19:49:08 2017 -0700 |
| committer | Dan Willemsen <dwillemsen@google.com> | Wed Apr 19 20:39:59 2017 -0700 |
| tree | 151d10208e5bc0d1f15f76446db73dfe6c85bb71 | |
| parent | 6f2e6b252464097cff52f4a8f77cbad1001bfa3a [diff] |
DO NOT MERGE: Move camera headers to camera/include In preparation for moving libcamera_client to Soong, this is a backport of the camera portion of the change to move headers from include/ into the appropriate directories. include/camera -> camera/include/camera Adds a symlink from the old location to the new one. Bug: 33241851 Test: mmma -j frameworks/av/camera Change-Id: Ic508c2d0100f4e84b63e745d50eca1402b6fed6c (cherry picked from commit d008fd1e4f4cadd300355ece1547ec56d80227dc)
diff --git a/camera/Android.mk b/camera/Android.mk index c9c98e9..91d87ed 100644 --- a/camera/Android.mk +++ b/camera/Android.mk
@@ -65,11 +65,11 @@ system/media/camera/include \ system/media/private/camera/include \ frameworks/native/include/media/openmax \ - frameworks/av/include/camera + $(LOCAL_PATH)/include/camera LOCAL_EXPORT_C_INCLUDE_DIRS := \ system/media/camera/include \ - frameworks/av/include/camera + $(LOCAL_PATH)/include/camera LOCAL_CFLAGS += -Werror -Wall -Wextra
diff --git a/include/camera/Camera.h b/camera/include/camera/Camera.h similarity index 100% rename from include/camera/Camera.h rename to camera/include/camera/Camera.h
diff --git a/include/camera/CameraBase.h b/camera/include/camera/CameraBase.h similarity index 100% rename from include/camera/CameraBase.h rename to camera/include/camera/CameraBase.h
diff --git a/include/camera/CameraMetadata.h b/camera/include/camera/CameraMetadata.h similarity index 100% rename from include/camera/CameraMetadata.h rename to camera/include/camera/CameraMetadata.h
diff --git a/include/camera/CameraParameters.h b/camera/include/camera/CameraParameters.h similarity index 100% rename from include/camera/CameraParameters.h rename to camera/include/camera/CameraParameters.h
diff --git a/include/camera/CameraParameters2.h b/camera/include/camera/CameraParameters2.h similarity index 100% rename from include/camera/CameraParameters2.h rename to camera/include/camera/CameraParameters2.h
diff --git a/include/camera/CameraUtils.h b/camera/include/camera/CameraUtils.h similarity index 100% rename from include/camera/CameraUtils.h rename to camera/include/camera/CameraUtils.h
diff --git a/include/camera/CaptureResult.h b/camera/include/camera/CaptureResult.h similarity index 100% rename from include/camera/CaptureResult.h rename to camera/include/camera/CaptureResult.h
diff --git a/include/camera/ICameraRecordingProxy.h b/camera/include/camera/ICameraRecordingProxy.h similarity index 100% rename from include/camera/ICameraRecordingProxy.h rename to camera/include/camera/ICameraRecordingProxy.h
diff --git a/include/camera/ICameraRecordingProxyListener.h b/camera/include/camera/ICameraRecordingProxyListener.h similarity index 100% rename from include/camera/ICameraRecordingProxyListener.h rename to camera/include/camera/ICameraRecordingProxyListener.h
diff --git a/include/camera/ICameraServiceProxy.h b/camera/include/camera/ICameraServiceProxy.h similarity index 100% rename from include/camera/ICameraServiceProxy.h rename to camera/include/camera/ICameraServiceProxy.h
diff --git a/include/camera/VendorTagDescriptor.h b/camera/include/camera/VendorTagDescriptor.h similarity index 100% rename from include/camera/VendorTagDescriptor.h rename to camera/include/camera/VendorTagDescriptor.h
diff --git a/include/camera/android/hardware/ICamera.h b/camera/include/camera/android/hardware/ICamera.h similarity index 100% rename from include/camera/android/hardware/ICamera.h rename to camera/include/camera/android/hardware/ICamera.h
diff --git a/include/camera/android/hardware/ICameraClient.h b/camera/include/camera/android/hardware/ICameraClient.h similarity index 100% rename from include/camera/android/hardware/ICameraClient.h rename to camera/include/camera/android/hardware/ICameraClient.h
diff --git a/include/camera/camera2/CaptureRequest.h b/camera/include/camera/camera2/CaptureRequest.h similarity index 100% rename from include/camera/camera2/CaptureRequest.h rename to camera/include/camera/camera2/CaptureRequest.h
diff --git a/include/camera/camera2/OutputConfiguration.h b/camera/include/camera/camera2/OutputConfiguration.h similarity index 100% rename from include/camera/camera2/OutputConfiguration.h rename to camera/include/camera/camera2/OutputConfiguration.h
diff --git a/include/camera/camera2/SubmitInfo.h b/camera/include/camera/camera2/SubmitInfo.h similarity index 100% rename from include/camera/camera2/SubmitInfo.h rename to camera/include/camera/camera2/SubmitInfo.h
diff --git a/include/camera/ndk/NdkCameraCaptureSession.h b/camera/include/camera/ndk/NdkCameraCaptureSession.h similarity index 100% rename from include/camera/ndk/NdkCameraCaptureSession.h rename to camera/include/camera/ndk/NdkCameraCaptureSession.h
diff --git a/include/camera/ndk/NdkCameraDevice.h b/camera/include/camera/ndk/NdkCameraDevice.h similarity index 100% rename from include/camera/ndk/NdkCameraDevice.h rename to camera/include/camera/ndk/NdkCameraDevice.h
diff --git a/include/camera/ndk/NdkCameraError.h b/camera/include/camera/ndk/NdkCameraError.h similarity index 100% rename from include/camera/ndk/NdkCameraError.h rename to camera/include/camera/ndk/NdkCameraError.h
diff --git a/include/camera/ndk/NdkCameraManager.h b/camera/include/camera/ndk/NdkCameraManager.h similarity index 100% rename from include/camera/ndk/NdkCameraManager.h rename to camera/include/camera/ndk/NdkCameraManager.h
diff --git a/include/camera/ndk/NdkCameraMetadata.h b/camera/include/camera/ndk/NdkCameraMetadata.h similarity index 100% rename from include/camera/ndk/NdkCameraMetadata.h rename to camera/include/camera/ndk/NdkCameraMetadata.h
diff --git a/include/camera/ndk/NdkCameraMetadataTags.h b/camera/include/camera/ndk/NdkCameraMetadataTags.h similarity index 100% rename from include/camera/ndk/NdkCameraMetadataTags.h rename to camera/include/camera/ndk/NdkCameraMetadataTags.h
diff --git a/include/camera/ndk/NdkCaptureRequest.h b/camera/include/camera/ndk/NdkCaptureRequest.h similarity index 100% rename from include/camera/ndk/NdkCaptureRequest.h rename to camera/include/camera/ndk/NdkCaptureRequest.h
diff --git a/include/camera b/include/camera new file mode 120000 index 0000000..67a148a --- /dev/null +++ b/include/camera
@@ -0,0 +1 @@ +../camera/include/camera \ No newline at end of file