diff options
author | Steven Moreland <smoreland@google.com> | 2017-02-13 09:59:06 -0800 |
---|---|---|
committer | Steven Moreland <smoreland@google.com> | 2017-02-13 15:03:41 -0800 |
commit | a0da1a1c3dadac195e598890360c7b9226874ba8 (patch) | |
tree | eeab0787c1485eb42edd5aabace854fd7a245d9a | |
parent | ff4224809f8cf3e6d56c1dfdfd21adf340390e99 (diff) | |
download | android_hardware_interfaces-a0da1a1c3dadac195e598890360c7b9226874ba8.tar.gz android_hardware_interfaces-a0da1a1c3dadac195e598890360c7b9226874ba8.tar.bz2 android_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
60 files changed, 77 insertions, 26 deletions
diff --git a/audio/2.0/default/Android.mk b/audio/2.0/default/Android.mk index cbeda359c..9cb56c762 100644 --- a/audio/2.0/default/Android.mk +++ b/audio/2.0/default/Android.mk @@ -19,6 +19,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.audio@2.0-impl LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_PROPRIETARY_MODULE := true LOCAL_SRC_FILES := \ Conversions.cpp \ Device.cpp \ @@ -55,6 +56,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.audio@2.0-service LOCAL_INIT_RC := android.hardware.audio@2.0-service.rc LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_PROPRIETARY_MODULE := true LOCAL_SRC_FILES := \ service.cpp diff --git a/audio/2.0/default/android.hardware.audio@2.0-service.rc b/audio/2.0/default/android.hardware.audio@2.0-service.rc index 0a5bfc578..eeaf71b26 100644 --- a/audio/2.0/default/android.hardware.audio@2.0-service.rc +++ b/audio/2.0/default/android.hardware.audio@2.0-service.rc @@ -1,4 +1,4 @@ -service audio-hal-2-0 /system/bin/hw/android.hardware.audio@2.0-service +service audio-hal-2-0 /vendor/bin/hw/android.hardware.audio@2.0-service class hal user audioserver # media gid needed for /dev/fm (radio) and for /data/misc/media (tee) diff --git a/audio/effect/2.0/default/Android.mk b/audio/effect/2.0/default/Android.mk index 18076edc7..1541d41a8 100644 --- a/audio/effect/2.0/default/Android.mk +++ b/audio/effect/2.0/default/Android.mk @@ -2,6 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.audio.effect@2.0-impl +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ AcousticEchoCancelerEffect.cpp \ diff --git a/automotive/vehicle/2.0/default/Android.mk b/automotive/vehicle/2.0/default/Android.mk index e82204477..c394f2ee3 100644 --- a/automotive/vehicle/2.0/default/Android.mk +++ b/automotive/vehicle/2.0/default/Android.mk @@ -125,6 +125,7 @@ include $(BUILD_NATIVE_TEST) include $(CLEAR_VARS) LOCAL_MODULE := $(module_prefix)-service LOCAL_INIT_RC := $(module_prefix)-service.rc +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ diff --git a/automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc b/automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc index 1ee4d47c3..30e249e80 100644 --- a/automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc +++ b/automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc @@ -1,4 +1,4 @@ -service vehicle-hal-2.0 /system/bin/hw/android.hardware.automotive.vehicle@2.0-service +service vehicle-hal-2.0 /vendor/bin/hw/android.hardware.automotive.vehicle@2.0-service class hal user vehicle_network group system inet diff --git a/biometrics/fingerprint/2.1/default/Android.mk b/biometrics/fingerprint/2.1/default/Android.mk index e5c79feb8..ea20130c5 100644 --- a/biometrics/fingerprint/2.1/default/Android.mk +++ b/biometrics/fingerprint/2.1/default/Android.mk @@ -3,6 +3,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.biometrics.fingerprint@2.1-service LOCAL_INIT_RC := android.hardware.biometrics.fingerprint@2.1-service.rc +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ BiometricsFingerprint.cpp \ diff --git a/biometrics/fingerprint/2.1/default/android.hardware.biometrics.fingerprint@2.1-service.rc b/biometrics/fingerprint/2.1/default/android.hardware.biometrics.fingerprint@2.1-service.rc index 3de52ad3b..aa767a600 100644 --- a/biometrics/fingerprint/2.1/default/android.hardware.biometrics.fingerprint@2.1-service.rc +++ b/biometrics/fingerprint/2.1/default/android.hardware.biometrics.fingerprint@2.1-service.rc @@ -1,4 +1,4 @@ -service fps_hal /system/bin/hw/android.hardware.biometrics.fingerprint@2.1-service +service fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service # "class hal" causes a race condition on some devices due to files created # in /data. As a workaround, postpone startup until later in boot once # /data is mounted. diff --git a/broadcastradio/1.0/default/Android.mk b/broadcastradio/1.0/default/Android.mk index 734a0e129..569291ee9 100644 --- a/broadcastradio/1.0/default/Android.mk +++ b/broadcastradio/1.0/default/Android.mk @@ -2,6 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.broadcastradio@1.0-impl +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ BroadcastRadio.cpp \ diff --git a/camera/provider/2.4/default/Android.bp b/camera/provider/2.4/default/Android.bp index e29f62c3c..e0ae12f2b 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 31f08104f..192870b4f 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 diff --git a/configstore/1.0/default/Android.mk b/configstore/1.0/default/Android.mk index 5de3451fb..116126d97 100644 --- a/configstore/1.0/default/Android.mk +++ b/configstore/1.0/default/Android.mk @@ -3,6 +3,7 @@ LOCAL_PATH := $(call my-dir) ################################################################################ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.configstore@1.0-impl +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_RELATIVE_PATH := hw @@ -22,6 +23,7 @@ include $(BUILD_SHARED_LIBRARY) ################################################################################ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.configstore@1.0-service +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_INIT_RC := android.hardware.configstore@1.0-service.rc diff --git a/configstore/1.0/default/android.hardware.configstore@1.0-service.rc b/configstore/1.0/default/android.hardware.configstore@1.0-service.rc index 2e303b085..8741bdde6 100644 --- a/configstore/1.0/default/android.hardware.configstore@1.0-service.rc +++ b/configstore/1.0/default/android.hardware.configstore@1.0-service.rc @@ -1,4 +1,4 @@ -service configstore-hal-1-0 /system/bin/hw/android.hardware.configstore@1.0-service +service configstore-hal-1-0 /vendor/bin/hw/android.hardware.configstore@1.0-service class hal user system group system diff --git a/contexthub/1.0/default/Android.bp b/contexthub/1.0/default/Android.bp index 7c5f79d70..0e1dc7758 100644 --- a/contexthub/1.0/default/Android.bp +++ b/contexthub/1.0/default/Android.bp @@ -16,6 +16,7 @@ cc_library_shared { name: "android.hardware.contexthub@1.0-impl", + proprietary: true, relative_install_path: "hw", srcs: ["Contexthub.cpp"], shared_libs: [ diff --git a/contexthub/1.0/default/Android.mk b/contexthub/1.0/default/Android.mk index ad40878ce..cc36b7f5c 100644 --- a/contexthub/1.0/default/Android.mk +++ b/contexthub/1.0/default/Android.mk @@ -2,6 +2,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE := android.hardware.contexthub@1.0-service LOCAL_INIT_RC := android.hardware.contexthub@1.0-service.rc LOCAL_SRC_FILES := \ diff --git a/contexthub/1.0/default/android.hardware.contexthub@1.0-service.rc b/contexthub/1.0/default/android.hardware.contexthub@1.0-service.rc index 8dba85f5c..5677ec296 100644 --- a/contexthub/1.0/default/android.hardware.contexthub@1.0-service.rc +++ b/contexthub/1.0/default/android.hardware.contexthub@1.0-service.rc @@ -1,4 +1,4 @@ -service contexthub-hal-1-0 /system/bin/hw/android.hardware.contexthub@1.0-service +service contexthub-hal-1-0 /vendor/bin/hw/android.hardware.contexthub@1.0-service class hal user system group system diff --git a/drm/1.0/default/Android.mk b/drm/1.0/default/Android.mk index ac5b90af0..ea6cca0dc 100644 --- a/drm/1.0/default/Android.mk +++ b/drm/1.0/default/Android.mk @@ -21,6 +21,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.drm@1.0-service LOCAL_INIT_RC := android.hardware.drm@1.0-service.rc +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ service.cpp \ @@ -48,6 +49,7 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.drm@1.0-impl +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ DrmFactory.cpp \ diff --git a/drm/1.0/default/android.hardware.drm@1.0-service.rc b/drm/1.0/default/android.hardware.drm@1.0-service.rc index 281dc4bbb..e7beca35e 100644 --- a/drm/1.0/default/android.hardware.drm@1.0-service.rc +++ b/drm/1.0/default/android.hardware.drm@1.0-service.rc @@ -1,4 +1,4 @@ -service drm-hal-1-0 /system/bin/hw/android.hardware.drm@1.0-service +service drm-hal-1-0 /vendor/bin/hw/android.hardware.drm@1.0-service class hal user media group mediadrm drmrpc diff --git a/dumpstate/1.0/default/Android.mk b/dumpstate/1.0/default/Android.mk index 0b1518447..ed9ef9730 100644 --- a/dumpstate/1.0/default/Android.mk +++ b/dumpstate/1.0/default/Android.mk @@ -4,6 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.dumpstate@1.0-service LOCAL_INIT_RC := android.hardware.dumpstate@1.0-service.rc LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_PROPRIETARY_MODULE := true LOCAL_SRC_FILES := \ DumpstateDevice.cpp \ service.cpp diff --git a/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc b/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc index 99b968e98..0f2724851 100644 --- a/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc +++ b/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc @@ -1,4 +1,4 @@ -service dumpstate-1-0 /system/bin/hw/android.hardware.dumpstate@1.0-service +service dumpstate-1-0 /vendor/bin/hw/android.hardware.dumpstate@1.0-service class hal user system group system diff --git a/evs/1.0/default/Android.bp b/evs/1.0/default/Android.bp index e3bff2567..7be365a8d 100644 --- a/evs/1.0/default/Android.bp +++ b/evs/1.0/default/Android.bp @@ -1,5 +1,6 @@ cc_binary { name: "android.hardware.evs@1.0-service", + proprietary: true, relative_install_path: "hw", srcs: [ "service.cpp", diff --git a/evs/1.0/default/android.hardware.evs@1.0-service.rc b/evs/1.0/default/android.hardware.evs@1.0-service.rc index be7c9f98e..bb3866838 100644 --- a/evs/1.0/default/android.hardware.evs@1.0-service.rc +++ b/evs/1.0/default/android.hardware.evs@1.0-service.rc @@ -1,4 +1,4 @@ -service evs-hal-1-0 /system/bin/hw/android.hardware.evs@1.0-service +service evs-hal-1-0 /vendor/bin/hw/android.hardware.evs@1.0-service class hal user cameraserver group camera diff --git a/example/extension/light/2.0/default/Android.mk b/example/extension/light/2.0/default/Android.mk index 55c21b9c7..acd96381b 100644 --- a/example/extension/light/2.0/default/Android.mk +++ b/example/extension/light/2.0/default/Android.mk @@ -3,6 +3,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.example.extension.light@2.0-service LOCAL_INIT_RC := android.hardware.example.extension.light@2.0-service.rc +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ Light.cpp \ diff --git a/example/extension/light/2.0/default/android.hardware.example.extension.light@2.0-service.rc b/example/extension/light/2.0/default/android.hardware.example.extension.light@2.0-service.rc index 8a90d816c..7480a7e7d 100644 --- a/example/extension/light/2.0/default/android.hardware.example.extension.light@2.0-service.rc +++ b/example/extension/light/2.0/default/android.hardware.example.extension.light@2.0-service.rc @@ -1,4 +1,4 @@ -service light-ext-2-0 /system/bin/hw/android.hardware.example.extension.light@2.0-service +service light-ext-2-0 /vendor/bin/hw/android.hardware.example.extension.light@2.0-service class hal user system group system readproc
\ No newline at end of file diff --git a/gatekeeper/1.0/default/Android.mk b/gatekeeper/1.0/default/Android.mk index e3b7d10a0..94dc1eaad 100644 --- a/gatekeeper/1.0/default/Android.mk +++ b/gatekeeper/1.0/default/Android.mk @@ -3,6 +3,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE := android.hardware.gatekeeper@1.0-impl LOCAL_SRC_FILES := \ @@ -22,6 +23,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE := android.hardware.gatekeeper@1.0-service LOCAL_INIT_RC := android.hardware.gatekeeper@1.0-service.rc diff --git a/gatekeeper/1.0/default/android.hardware.gatekeeper@1.0-service.rc b/gatekeeper/1.0/default/android.hardware.gatekeeper@1.0-service.rc index ac15e2381..d3f5e9d1e 100644 --- a/gatekeeper/1.0/default/android.hardware.gatekeeper@1.0-service.rc +++ b/gatekeeper/1.0/default/android.hardware.gatekeeper@1.0-service.rc @@ -1,4 +1,4 @@ -service gatekeeper-1-0 /system/bin/hw/android.hardware.gatekeeper@1.0-service +service gatekeeper-1-0 /vendor/bin/hw/android.hardware.gatekeeper@1.0-service class hal user system group system diff --git a/gnss/1.0/default/Android.mk b/gnss/1.0/default/Android.mk index a6f73f204..73889b5fa 100644 --- a/gnss/1.0/default/Android.mk +++ b/gnss/1.0/default/Android.mk @@ -2,6 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@1.0-impl +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ ThreadCreationWrapper.cpp \ @@ -31,6 +32,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE := android.hardware.gnss@1.0-service LOCAL_INIT_RC := android.hardware.gnss@1.0-service.rc LOCAL_SRC_FILES := \ diff --git a/gnss/1.0/default/android.hardware.gnss@1.0-service.rc b/gnss/1.0/default/android.hardware.gnss@1.0-service.rc index eeb2e43f4..cf44944dc 100644 --- a/gnss/1.0/default/android.hardware.gnss@1.0-service.rc +++ b/gnss/1.0/default/android.hardware.gnss@1.0-service.rc @@ -1,4 +1,4 @@ -service gnss_service /system/bin/hw/android.hardware.gnss@1.0-service +service gnss_service /vendor/bin/hw/android.hardware.gnss@1.0-service class main user system group system diff --git a/graphics/allocator/2.0/default/Android.bp b/graphics/allocator/2.0/default/Android.bp index f0c736cca..315893fe3 100644 --- a/graphics/allocator/2.0/default/Android.bp +++ b/graphics/allocator/2.0/default/Android.bp @@ -1,5 +1,6 @@ cc_library_shared { name: "android.hardware.graphics.allocator@2.0-impl", + proprietary: true, relative_install_path: "hw", srcs: ["Gralloc.cpp"], cppflags: ["-Wall", "-Wextra"], @@ -18,6 +19,7 @@ cc_library_shared { cc_binary { name: "android.hardware.graphics.allocator@2.0-service", + proprietary: true, relative_install_path: "hw", srcs: ["service.cpp"], init_rc: ["android.hardware.graphics.allocator@2.0-service.rc"], diff --git a/graphics/allocator/2.0/default/android.hardware.graphics.allocator@2.0-service.rc b/graphics/allocator/2.0/default/android.hardware.graphics.allocator@2.0-service.rc index 8bb0d85eb..c4715cd36 100644 --- a/graphics/allocator/2.0/default/android.hardware.graphics.allocator@2.0-service.rc +++ b/graphics/allocator/2.0/default/android.hardware.graphics.allocator@2.0-service.rc @@ -1,4 +1,4 @@ -service gralloc-2-0 /system/bin/hw/android.hardware.graphics.allocator@2.0-service +service gralloc-2-0 /vendor/bin/hw/android.hardware.graphics.allocator@2.0-service class hal user system group graphics drmrpc readproc diff --git a/graphics/composer/2.1/default/Android.bp b/graphics/composer/2.1/default/Android.bp index 46cd0c4f6..4a5c70d8e 100644 --- a/graphics/composer/2.1/default/Android.bp +++ b/graphics/composer/2.1/default/Android.bp @@ -20,6 +20,7 @@ cc_library_static { cc_library_shared { name: "android.hardware.graphics.composer@2.1-impl", + proprietary: true, relative_install_path: "hw", srcs: ["Hwc.cpp"], static_libs: ["libhwcomposer-client"], @@ -41,6 +42,7 @@ cc_library_shared { cc_binary { name: "android.hardware.graphics.composer@2.1-service", + proprietary: true, relative_install_path: "hw", srcs: ["service.cpp"], init_rc: ["android.hardware.graphics.composer@2.1-service.rc"], diff --git a/graphics/composer/2.1/default/android.hardware.graphics.composer@2.1-service.rc b/graphics/composer/2.1/default/android.hardware.graphics.composer@2.1-service.rc index 9548d4174..4f01bd9d0 100644 --- a/graphics/composer/2.1/default/android.hardware.graphics.composer@2.1-service.rc +++ b/graphics/composer/2.1/default/android.hardware.graphics.composer@2.1-service.rc @@ -1,4 +1,4 @@ -service hwcomposer-2-1 /system/bin/hw/android.hardware.graphics.composer@2.1-service +service hwcomposer-2-1 /vendor/bin/hw/android.hardware.graphics.composer@2.1-service class hal user system group graphics drmrpc readproc diff --git a/graphics/mapper/2.0/default/Android.bp b/graphics/mapper/2.0/default/Android.bp index c3d22811d..ca159613b 100644 --- a/graphics/mapper/2.0/default/Android.bp +++ b/graphics/mapper/2.0/default/Android.bp @@ -15,6 +15,7 @@ cc_library_shared { name: "android.hardware.graphics.mapper@2.0-impl", + proprietary: true, relative_install_path: "hw", srcs: ["GrallocMapper.cpp"], cppflags: ["-Wall", "-Wextra"], diff --git a/health/1.0/default/Android.mk b/health/1.0/default/Android.mk index 89d28cba3..3c9718580 100644 --- a/health/1.0/default/Android.mk +++ b/health/1.0/default/Android.mk @@ -2,6 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.health@1.0-impl +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_C_INCLUDES := system/core/healthd/include system/core/base/include LOCAL_SRC_FILES := \ @@ -37,6 +38,7 @@ LOCAL_SHARED_LIBRARIES := \ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE := android.hardware.health@1.0-service LOCAL_INIT_RC := android.hardware.health@1.0-service.rc diff --git a/health/1.0/default/android.hardware.health@1.0-service.rc b/health/1.0/default/android.hardware.health@1.0-service.rc index a0d6a5604..13cd7a5cf 100644 --- a/health/1.0/default/android.hardware.health@1.0-service.rc +++ b/health/1.0/default/android.hardware.health@1.0-service.rc @@ -1,4 +1,4 @@ -service health-hal-1-0 /system/bin/hw/android.hardware.health@1.0-service +service health-hal-1-0 /vendor/bin/hw/android.hardware.health@1.0-service class hal user system group system diff --git a/keymaster/3.0/default/Android.mk b/keymaster/3.0/default/Android.mk index 36d88905a..87a8a051e 100644 --- a/keymaster/3.0/default/Android.mk +++ b/keymaster/3.0/default/Android.mk @@ -2,6 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.keymaster@3.0-impl +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ KeymasterDevice.cpp \ @@ -22,6 +23,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE := android.hardware.keymaster@3.0-service LOCAL_INIT_RC := android.hardware.keymaster@3.0-service.rc LOCAL_SRC_FILES := \ diff --git a/keymaster/3.0/default/android.hardware.keymaster@3.0-service.rc b/keymaster/3.0/default/android.hardware.keymaster@3.0-service.rc index 86ed1e70e..fd43178e0 100644 --- a/keymaster/3.0/default/android.hardware.keymaster@3.0-service.rc +++ b/keymaster/3.0/default/android.hardware.keymaster@3.0-service.rc @@ -1,4 +1,4 @@ -service keymaster-3-0 /system/bin/hw/android.hardware.keymaster@3.0-service +service keymaster-3-0 /vendor/bin/hw/android.hardware.keymaster@3.0-service class hal user system group system drmrpc diff --git a/light/2.0/default/Android.mk b/light/2.0/default/Android.mk index d14d7c040..7bd096c86 100644 --- a/light/2.0/default/Android.mk +++ b/light/2.0/default/Android.mk @@ -2,6 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.light@2.0-impl +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ Light.cpp \ @@ -22,6 +23,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE := android.hardware.light@2.0-service LOCAL_INIT_RC := android.hardware.light@2.0-service.rc LOCAL_SRC_FILES := \ diff --git a/light/2.0/default/android.hardware.light@2.0-service.rc b/light/2.0/default/android.hardware.light@2.0-service.rc index 3ba97d812..c3284c695 100644 --- a/light/2.0/default/android.hardware.light@2.0-service.rc +++ b/light/2.0/default/android.hardware.light@2.0-service.rc @@ -1,4 +1,4 @@ -service light-hal-2-0 /system/bin/hw/android.hardware.light@2.0-service +service light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service class hal user system group system
\ No newline at end of file diff --git a/memtrack/1.0/default/Android.bp b/memtrack/1.0/default/Android.bp index 91fa1ea33..b43a159be 100644 --- a/memtrack/1.0/default/Android.bp +++ b/memtrack/1.0/default/Android.bp @@ -14,6 +14,7 @@ cc_library_shared { name: "android.hardware.memtrack@1.0-impl", + proprietary: true, relative_install_path: "hw", srcs: ["Memtrack.cpp"], @@ -32,6 +33,7 @@ cc_library_shared { cc_binary { relative_install_path: "hw", + proprietary: true, name: "android.hardware.memtrack@1.0-service", init_rc: ["android.hardware.memtrack@1.0-service.rc"], srcs: ["service.cpp"], diff --git a/memtrack/1.0/default/android.hardware.memtrack@1.0-service.rc b/memtrack/1.0/default/android.hardware.memtrack@1.0-service.rc index 14e7d0081..c975a181b 100644 --- a/memtrack/1.0/default/android.hardware.memtrack@1.0-service.rc +++ b/memtrack/1.0/default/android.hardware.memtrack@1.0-service.rc @@ -1,4 +1,4 @@ -service memtrack-hal-1-0 /system/bin/hw/android.hardware.memtrack@1.0-service +service memtrack-hal-1-0 /vendor/bin/hw/android.hardware.memtrack@1.0-service class hal user system group system diff --git a/power/1.0/default/Android.bp b/power/1.0/default/Android.bp index 1a5a897e2..91b92259d 100644 --- a/power/1.0/default/Android.bp +++ b/power/1.0/default/Android.bp @@ -14,6 +14,7 @@ cc_library_shared { name: "android.hardware.power@1.0-impl", + proprietary: true, relative_install_path: "hw", srcs: ["Power.cpp"], @@ -30,6 +31,7 @@ cc_library_shared { } cc_binary { + proprietary: true, relative_install_path: "hw", name: "android.hardware.power@1.0-service", init_rc: ["android.hardware.power@1.0-service.rc"], diff --git a/power/1.0/default/android.hardware.power@1.0-service.rc b/power/1.0/default/android.hardware.power@1.0-service.rc index 606354193..1777e9084 100644 --- a/power/1.0/default/android.hardware.power@1.0-service.rc +++ b/power/1.0/default/android.hardware.power@1.0-service.rc @@ -1,4 +1,4 @@ -service power-hal-1-0 /system/bin/hw/android.hardware.power@1.0-service +service power-hal-1-0 /vendor/bin/hw/android.hardware.power@1.0-service class hal user system group system diff --git a/sensors/1.0/default/Android.bp b/sensors/1.0/default/Android.bp index 994febe22..3930504c9 100644 --- a/sensors/1.0/default/Android.bp +++ b/sensors/1.0/default/Android.bp @@ -1,5 +1,6 @@ cc_library_shared { name: "android.hardware.sensors@1.0-impl", + proprietary: true, relative_install_path: "hw", srcs: ["Sensors.cpp"], shared_libs: [ diff --git a/sensors/1.0/default/Android.mk b/sensors/1.0/default/Android.mk index f37c3cb8f..6a1aab424 100644 --- a/sensors/1.0/default/Android.mk +++ b/sensors/1.0/default/Android.mk @@ -2,6 +2,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE := android.hardware.sensors@1.0-service LOCAL_INIT_RC := android.hardware.sensors@1.0-service.rc LOCAL_SRC_FILES := \ diff --git a/sensors/1.0/default/android.hardware.sensors@1.0-service.rc b/sensors/1.0/default/android.hardware.sensors@1.0-service.rc index 2cba0fc0c..2360863a0 100644 --- a/sensors/1.0/default/android.hardware.sensors@1.0-service.rc +++ b/sensors/1.0/default/android.hardware.sensors@1.0-service.rc @@ -1,4 +1,4 @@ -service sensors-hal-1-0 /system/bin/hw/android.hardware.sensors@1.0-service +service sensors-hal-1-0 /vendor/bin/hw/android.hardware.sensors@1.0-service class main user system group system readproc diff --git a/soundtrigger/2.0/default/Android.mk b/soundtrigger/2.0/default/Android.mk index 498c54fb2..70c78e072 100644 --- a/soundtrigger/2.0/default/Android.mk +++ b/soundtrigger/2.0/default/Android.mk @@ -18,6 +18,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.soundtrigger@2.0-impl +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ SoundTriggerHalImpl.cpp diff --git a/thermal/1.0/default/Android.bp b/thermal/1.0/default/Android.bp index 819f0b1a3..96f69cc95 100644 --- a/thermal/1.0/default/Android.bp +++ b/thermal/1.0/default/Android.bp @@ -1,5 +1,6 @@ cc_library_shared { name: "android.hardware.thermal@1.0-impl", + proprietary: true, relative_install_path: "hw", srcs: ["Thermal.cpp"], shared_libs: [ diff --git a/thermal/1.0/default/Android.mk b/thermal/1.0/default/Android.mk index 9039e9f82..72c46affa 100644 --- a/thermal/1.0/default/Android.mk +++ b/thermal/1.0/default/Android.mk @@ -17,6 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE := android.hardware.thermal@1.0-service LOCAL_INIT_RC := android.hardware.thermal@1.0-service.rc LOCAL_SRC_FILES := \ diff --git a/thermal/1.0/default/android.hardware.thermal@1.0-service.rc b/thermal/1.0/default/android.hardware.thermal@1.0-service.rc index cc7ba6a45..f8da101f2 100644 --- a/thermal/1.0/default/android.hardware.thermal@1.0-service.rc +++ b/thermal/1.0/default/android.hardware.thermal@1.0-service.rc @@ -1,4 +1,4 @@ -service thermal-hal-1-0 /system/bin/hw/android.hardware.thermal@1.0-service +service thermal-hal-1-0 /vendor/bin/hw/android.hardware.thermal@1.0-service class hal user system group system readproc diff --git a/tv/cec/1.0/default/Android.mk b/tv/cec/1.0/default/Android.mk index 492fc8c54..3f986e6d5 100644 --- a/tv/cec/1.0/default/Android.mk +++ b/tv/cec/1.0/default/Android.mk @@ -2,6 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.tv.cec@1.0-impl +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ HdmiCec.cpp @@ -21,6 +22,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE := android.hardware.tv.cec@1.0-service LOCAL_INIT_RC := android.hardware.tv.cec@1.0-service.rc LOCAL_SRC_FILES := \ diff --git a/tv/cec/1.0/default/android.hardware.tv.cec@1.0-service.rc b/tv/cec/1.0/default/android.hardware.tv.cec@1.0-service.rc index 1af32cb94..9c80094d5 100644 --- a/tv/cec/1.0/default/android.hardware.tv.cec@1.0-service.rc +++ b/tv/cec/1.0/default/android.hardware.tv.cec@1.0-service.rc @@ -1,4 +1,4 @@ -service cec-hal-1-0 /system/bin/hw/android.hardware.tv.cec@1.0-service +service cec-hal-1-0 /vendor/bin/hw/android.hardware.tv.cec@1.0-service class hal user system group system diff --git a/tv/input/1.0/default/Android.mk b/tv/input/1.0/default/Android.mk index 9728015d6..be1775d48 100644 --- a/tv/input/1.0/default/Android.mk +++ b/tv/input/1.0/default/Android.mk @@ -2,6 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.tv.input@1.0-impl +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ TvInput.cpp \ @@ -21,6 +22,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE := android.hardware.tv.input@1.0-service LOCAL_INIT_RC := android.hardware.tv.input@1.0-service.rc LOCAL_SRC_FILES := \ diff --git a/tv/input/1.0/default/android.hardware.tv.input@1.0-service.rc b/tv/input/1.0/default/android.hardware.tv.input@1.0-service.rc index c5bc0b7c8..9edeba680 100644 --- a/tv/input/1.0/default/android.hardware.tv.input@1.0-service.rc +++ b/tv/input/1.0/default/android.hardware.tv.input@1.0-service.rc @@ -1,4 +1,4 @@ -service tv-input-1-0 /system/bin/hw/android.hardware.tv.input@1.0-service +service tv-input-1-0 /vendor/bin/hw/android.hardware.tv.input@1.0-service class hal user system group system readproc diff --git a/usb/1.0/default/Android.mk b/usb/1.0/default/Android.mk index 09d7ce739..489293c0e 100644 --- a/usb/1.0/default/Android.mk +++ b/usb/1.0/default/Android.mk @@ -2,6 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE := android.hardware.usb@1.0-service LOCAL_INIT_RC := android.hardware.usb@1.0-service.rc LOCAL_SRC_FILES := \ diff --git a/usb/1.0/default/android.hardware.usb@1.0-service.rc b/usb/1.0/default/android.hardware.usb@1.0-service.rc index 77dfc937e..6ea07203d 100644 --- a/usb/1.0/default/android.hardware.usb@1.0-service.rc +++ b/usb/1.0/default/android.hardware.usb@1.0-service.rc @@ -1,4 +1,4 @@ -service usb-hal-1-0 /system/bin/hw/android.hardware.usb@1.0-service +service usb-hal-1-0 /vendor/bin/hw/android.hardware.usb@1.0-service class hal user system group system diff --git a/vibrator/1.0/default/Android.bp b/vibrator/1.0/default/Android.bp index 5e488e6a9..6cb980292 100644 --- a/vibrator/1.0/default/Android.bp +++ b/vibrator/1.0/default/Android.bp @@ -12,8 +12,10 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. + cc_library_shared { name: "android.hardware.vibrator@1.0-impl", + proprietary: true, relative_install_path: "hw", srcs: ["Vibrator.cpp"], shared_libs: [ diff --git a/vibrator/1.0/default/Android.mk b/vibrator/1.0/default/Android.mk index 5ba334b4c..091d61514 100644 --- a/vibrator/1.0/default/Android.mk +++ b/vibrator/1.0/default/Android.mk @@ -19,6 +19,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.vibrator@1.0-service LOCAL_INIT_RC := android.hardware.vibrator@1.0-service.rc +LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ service.cpp \ diff --git a/vibrator/1.0/default/android.hardware.vibrator@1.0-service.rc b/vibrator/1.0/default/android.hardware.vibrator@1.0-service.rc index a7836b375..4153c44be 100644 --- a/vibrator/1.0/default/android.hardware.vibrator@1.0-service.rc +++ b/vibrator/1.0/default/android.hardware.vibrator@1.0-service.rc @@ -1,4 +1,4 @@ -service vibrator-1-0 /system/bin/hw/android.hardware.vibrator@1.0-service +service vibrator-1-0 /vendor/bin/hw/android.hardware.vibrator@1.0-service class hal user system group system readproc diff --git a/vr/1.0/default/Android.bp b/vr/1.0/default/Android.bp index da8a754e3..0d374d351 100644 --- a/vr/1.0/default/Android.bp +++ b/vr/1.0/default/Android.bp @@ -1,5 +1,6 @@ cc_library_shared { name: "android.hardware.vr@1.0-impl", + proprietary: true, relative_install_path: "hw", srcs: ["Vr.cpp"], shared_libs: [ @@ -18,6 +19,7 @@ cc_library_shared { cc_binary { relative_install_path: "hw", + proprietary: true, name: "android.hardware.vr@1.0-service", init_rc: ["android.hardware.vr@1.0-service.rc"], srcs: ["service.cpp"], diff --git a/vr/1.0/default/android.hardware.vr@1.0-service.rc b/vr/1.0/default/android.hardware.vr@1.0-service.rc index 617708934..ba4330253 100644 --- a/vr/1.0/default/android.hardware.vr@1.0-service.rc +++ b/vr/1.0/default/android.hardware.vr@1.0-service.rc @@ -1,4 +1,4 @@ -service vr-1-0 /system/bin/hw/android.hardware.vr@1.0-service +service vr-1-0 /vendor/bin/hw/android.hardware.vr@1.0-service class hal user system group system readproc |