summaryrefslogtreecommitdiffstats
path: root/vibrator
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 /vibrator
parentff4224809f8cf3e6d56c1dfdfd21adf340390e99 (diff)
downloadandroid_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
Diffstat (limited to 'vibrator')
-rw-r--r--vibrator/1.0/default/Android.bp2
-rw-r--r--vibrator/1.0/default/Android.mk1
-rw-r--r--vibrator/1.0/default/android.hardware.vibrator@1.0-service.rc2
3 files changed, 4 insertions, 1 deletions
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