diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-01-11 23:43:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-11 23:43:16 +0000 |
| commit | a8d358fb6313724ab1ae68c487c2006569cd5091 (patch) | |
| tree | 5ab07dd5d6eba4a0101e2b5a23db379460ce7d55 /camera | |
| parent | 15336c44b747b2dcc1dc29fb4dc17b65d6c0fe26 (diff) | |
| parent | a18049ad138a79890c79335e90822215d7df506f (diff) | |
| download | platform_hardware_interfaces-a8d358fb6313724ab1ae68c487c2006569cd5091.tar.gz platform_hardware_interfaces-a8d358fb6313724ab1ae68c487c2006569cd5091.tar.bz2 platform_hardware_interfaces-a8d358fb6313724ab1ae68c487c2006569cd5091.zip | |
Merge changes from topic 'bphwfoo'
* changes:
Bp/nFoo -> Bp/nHwFoo.
Bp/nFoo -> Bp/nHwFoo
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/device/1.0/Android.bp | 12 | ||||
| -rw-r--r-- | camera/device/3.2/Android.bp | 12 | ||||
| -rw-r--r-- | camera/provider/2.4/Android.bp | 8 |
3 files changed, 16 insertions, 16 deletions
diff --git a/camera/device/1.0/Android.bp b/camera/device/1.0/Android.bp index 29e2d81703..9a6941afd0 100644 --- a/camera/device/1.0/Android.bp +++ b/camera/device/1.0/Android.bp @@ -32,18 +32,18 @@ genrule { "android/hardware/camera/device/1.0/types.h", "android/hardware/camera/device/1.0/ICameraDevice.h", "android/hardware/camera/device/1.0/IHwCameraDevice.h", - "android/hardware/camera/device/1.0/BnCameraDevice.h", - "android/hardware/camera/device/1.0/BpCameraDevice.h", + "android/hardware/camera/device/1.0/BnHwCameraDevice.h", + "android/hardware/camera/device/1.0/BpHwCameraDevice.h", "android/hardware/camera/device/1.0/BsCameraDevice.h", "android/hardware/camera/device/1.0/ICameraDeviceCallback.h", "android/hardware/camera/device/1.0/IHwCameraDeviceCallback.h", - "android/hardware/camera/device/1.0/BnCameraDeviceCallback.h", - "android/hardware/camera/device/1.0/BpCameraDeviceCallback.h", + "android/hardware/camera/device/1.0/BnHwCameraDeviceCallback.h", + "android/hardware/camera/device/1.0/BpHwCameraDeviceCallback.h", "android/hardware/camera/device/1.0/BsCameraDeviceCallback.h", "android/hardware/camera/device/1.0/ICameraDevicePreviewCallback.h", "android/hardware/camera/device/1.0/IHwCameraDevicePreviewCallback.h", - "android/hardware/camera/device/1.0/BnCameraDevicePreviewCallback.h", - "android/hardware/camera/device/1.0/BpCameraDevicePreviewCallback.h", + "android/hardware/camera/device/1.0/BnHwCameraDevicePreviewCallback.h", + "android/hardware/camera/device/1.0/BpHwCameraDevicePreviewCallback.h", "android/hardware/camera/device/1.0/BsCameraDevicePreviewCallback.h", ], } diff --git a/camera/device/3.2/Android.bp b/camera/device/3.2/Android.bp index 921acedb7d..8b72d5b0e6 100644 --- a/camera/device/3.2/Android.bp +++ b/camera/device/3.2/Android.bp @@ -32,18 +32,18 @@ genrule { "android/hardware/camera/device/3.2/types.h", "android/hardware/camera/device/3.2/ICameraDevice.h", "android/hardware/camera/device/3.2/IHwCameraDevice.h", - "android/hardware/camera/device/3.2/BnCameraDevice.h", - "android/hardware/camera/device/3.2/BpCameraDevice.h", + "android/hardware/camera/device/3.2/BnHwCameraDevice.h", + "android/hardware/camera/device/3.2/BpHwCameraDevice.h", "android/hardware/camera/device/3.2/BsCameraDevice.h", "android/hardware/camera/device/3.2/ICameraDeviceCallback.h", "android/hardware/camera/device/3.2/IHwCameraDeviceCallback.h", - "android/hardware/camera/device/3.2/BnCameraDeviceCallback.h", - "android/hardware/camera/device/3.2/BpCameraDeviceCallback.h", + "android/hardware/camera/device/3.2/BnHwCameraDeviceCallback.h", + "android/hardware/camera/device/3.2/BpHwCameraDeviceCallback.h", "android/hardware/camera/device/3.2/BsCameraDeviceCallback.h", "android/hardware/camera/device/3.2/ICameraDeviceSession.h", "android/hardware/camera/device/3.2/IHwCameraDeviceSession.h", - "android/hardware/camera/device/3.2/BnCameraDeviceSession.h", - "android/hardware/camera/device/3.2/BpCameraDeviceSession.h", + "android/hardware/camera/device/3.2/BnHwCameraDeviceSession.h", + "android/hardware/camera/device/3.2/BpHwCameraDeviceSession.h", "android/hardware/camera/device/3.2/BsCameraDeviceSession.h", ], } diff --git a/camera/provider/2.4/Android.bp b/camera/provider/2.4/Android.bp index ce22cb0a42..f5f10de35a 100644 --- a/camera/provider/2.4/Android.bp +++ b/camera/provider/2.4/Android.bp @@ -25,13 +25,13 @@ genrule { out: [ "android/hardware/camera/provider/2.4/ICameraProvider.h", "android/hardware/camera/provider/2.4/IHwCameraProvider.h", - "android/hardware/camera/provider/2.4/BnCameraProvider.h", - "android/hardware/camera/provider/2.4/BpCameraProvider.h", + "android/hardware/camera/provider/2.4/BnHwCameraProvider.h", + "android/hardware/camera/provider/2.4/BpHwCameraProvider.h", "android/hardware/camera/provider/2.4/BsCameraProvider.h", "android/hardware/camera/provider/2.4/ICameraProviderCallback.h", "android/hardware/camera/provider/2.4/IHwCameraProviderCallback.h", - "android/hardware/camera/provider/2.4/BnCameraProviderCallback.h", - "android/hardware/camera/provider/2.4/BpCameraProviderCallback.h", + "android/hardware/camera/provider/2.4/BnHwCameraProviderCallback.h", + "android/hardware/camera/provider/2.4/BpHwCameraProviderCallback.h", "android/hardware/camera/provider/2.4/BsCameraProviderCallback.h", ], } |