diff options
| author | Steven Moreland <smoreland@google.com> | 2017-03-08 16:11:32 -0800 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2017-03-08 19:31:53 -0800 |
| commit | 48c52249e47a4d742faf037d6de7811f57de85e1 (patch) | |
| tree | ca006555013e28ac8ee71c4244395b634d5dcf44 /camera | |
| parent | c615951317e4951ebf4fc48d2e9adb9686faf8e1 (diff) | |
| download | android_hardware_interfaces-48c52249e47a4d742faf037d6de7811f57de85e1.tar.gz android_hardware_interfaces-48c52249e47a4d742faf037d6de7811f57de85e1.tar.bz2 android_hardware_interfaces-48c52249e47a4d742faf037d6de7811f57de85e1.zip | |
hidl_default to all targets.
find hardware/interfaces -type f -not -path "*/.git/*" \
-exec sed -i -e '/cc_[A-Za-z_]\+/ { N; s/$/\n defaults:
\["hidl_defaults"\],/ }' {} \;
./hardware/interfaces/update-makefiles.sh
Test: pass
Bug: 35840847
Change-Id: If10c464d2f000b85c8d698fe11a4f3fc4cfad282
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/common/1.0/default/Android.bp | 1 | ||||
| -rw-r--r-- | camera/device/1.0/default/Android.bp | 1 | ||||
| -rw-r--r-- | camera/device/3.2/default/Android.bp | 1 | ||||
| -rw-r--r-- | camera/provider/2.4/default/Android.bp | 2 | ||||
| -rw-r--r-- | camera/provider/2.4/vts/functional/Android.bp | 1 |
5 files changed, 6 insertions, 0 deletions
diff --git a/camera/common/1.0/default/Android.bp b/camera/common/1.0/default/Android.bp index 9ec266c12..643748046 100644 --- a/camera/common/1.0/default/Android.bp +++ b/camera/common/1.0/default/Android.bp @@ -1,5 +1,6 @@ cc_library_static { name: "android.hardware.camera.common@1.0-helper", + defaults: ["hidl_defaults"], srcs: [ "CameraModule.cpp", "CameraMetadata.cpp", diff --git a/camera/device/1.0/default/Android.bp b/camera/device/1.0/default/Android.bp index 166378715..eec641ad0 100644 --- a/camera/device/1.0/default/Android.bp +++ b/camera/device/1.0/default/Android.bp @@ -1,5 +1,6 @@ cc_library_shared { name: "camera.device@1.0-impl", + defaults: ["hidl_defaults"], srcs: [ "CameraDevice.cpp", ], diff --git a/camera/device/3.2/default/Android.bp b/camera/device/3.2/default/Android.bp index f638f6f76..3767e09b5 100644 --- a/camera/device/3.2/default/Android.bp +++ b/camera/device/3.2/default/Android.bp @@ -1,5 +1,6 @@ cc_library_shared { name: "camera.device@3.2-impl", + defaults: ["hidl_defaults"], srcs: ["CameraDevice.cpp", "CameraDeviceSession.cpp", "convert.cpp"], diff --git a/camera/provider/2.4/default/Android.bp b/camera/provider/2.4/default/Android.bp index a6febec83..42dec4d64 100644 --- a/camera/provider/2.4/default/Android.bp +++ b/camera/provider/2.4/default/Android.bp @@ -1,5 +1,6 @@ cc_library_shared { name: "android.hardware.camera.provider@2.4-impl", + defaults: ["hidl_defaults"], proprietary: true, relative_install_path: "hw", srcs: ["CameraProvider.cpp"], @@ -25,6 +26,7 @@ cc_library_shared { cc_binary { name: "android.hardware.camera.provider@2.4-service", + defaults: ["hidl_defaults"], proprietary: true, relative_install_path: "hw", srcs: ["service.cpp"], diff --git a/camera/provider/2.4/vts/functional/Android.bp b/camera/provider/2.4/vts/functional/Android.bp index f47815269..3e5d99611 100644 --- a/camera/provider/2.4/vts/functional/Android.bp +++ b/camera/provider/2.4/vts/functional/Android.bp @@ -16,6 +16,7 @@ cc_test { name: "VtsHalCameraProviderV2_4TargetTest", + defaults: ["hidl_defaults"], srcs: ["VtsHalCameraProviderV2_4TargetTest.cpp"], shared_libs: [ "liblog", |