summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2017-02-13 09:59:06 -0800
committerSteven Moreland <smoreland@google.com>2017-02-13 15:03:41 -0800
commita0da1a1c3dadac195e598890360c7b9226874ba8 (patch)
treeeeab0787c1485eb42edd5aabace854fd7a245d9a /camera
parentff4224809f8cf3e6d56c1dfdfd21adf340390e99 (diff)
downloadplatform_hardware_interfaces-a0da1a1c3dadac195e598890360c7b9226874ba8.tar.gz
platform_hardware_interfaces-a0da1a1c3dadac195e598890360c7b9226874ba8.tar.bz2
platform_hardware_interfaces-a0da1a1c3dadac195e598890360c7b9226874ba8.zip
Move hidl shims to the vendor partition. (2/2)
We need google shims on the vendor partition because they are providing an implementation of a vendor defined interface. They were written by google just as a courtesy/to make the transition easier. They're basically a set for vendors to assemble their hal implementations from. Bug: 34135607 Test: marlin persist.hal.binderization on/off Change-Id: I2e2af5af39264cf290259755bb9b2eb9827a21f5
Diffstat (limited to 'camera')
-rw-r--r--camera/provider/2.4/default/Android.bp2
-rw-r--r--camera/provider/2.4/default/android.hardware.camera.provider@2.4-service.rc2
2 files changed, 3 insertions, 1 deletions
diff --git a/camera/provider/2.4/default/Android.bp b/camera/provider/2.4/default/Android.bp
index e29f62c3c4..e0ae12f2b5 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",
+ proprietary: true,
relative_install_path: "hw",
srcs: ["CameraProvider.cpp"],
shared_libs: [
@@ -24,6 +25,7 @@ cc_library_shared {
cc_binary {
name: "android.hardware.camera.provider@2.4-service",
+ proprietary: true,
relative_install_path: "hw",
srcs: ["service.cpp"],
compile_multilib: "32",
diff --git a/camera/provider/2.4/default/android.hardware.camera.provider@2.4-service.rc b/camera/provider/2.4/default/android.hardware.camera.provider@2.4-service.rc
index 31f08104ff..192870b4f3 100644
--- a/camera/provider/2.4/default/android.hardware.camera.provider@2.4-service.rc
+++ b/camera/provider/2.4/default/android.hardware.camera.provider@2.4-service.rc
@@ -1,4 +1,4 @@
-service camera-provider-2-4 /system/bin/hw/android.hardware.camera.provider@2.4-service
+service camera-provider-2-4 /vendor/bin/hw/android.hardware.camera.provider@2.4-service
class hal
user cameraserver
group audio camera input drmrpc