summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2020-01-07 22:43:01 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2020-01-07 22:43:01 +0000
commit663e1700bef5abac9e85f93c28a84b896c3b6276 (patch)
treed9cae074a3b54c79444cf317db3114d5d030f5e2
parentc0c8c00976aa69a2739b354ce406061f04ed0f3c (diff)
parent623e66caa78ff65540305c0a866f63f0603ea0e4 (diff)
Merge "vibrator: use package as name"
-rw-r--r--services/core/Android.bp2
-rw-r--r--services/core/jni/Android.bp2
2 files changed, 2 insertions, 2 deletions
diff --git a/services/core/Android.bp b/services/core/Android.bp
index cbd095b3a045..4c569efe4c0a 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -27,8 +27,8 @@ java_library_static {
"android.hardware.light-V2.0-java",
"android.hardware.power-V1.0-java",
"android.hardware.tv.cec-V1.0-java",
+ "android.hardware.vibrator-java",
"app-compat-annotations",
- "vintf-vibrator-java",
"framework-tethering",
],
diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
index 2b1c07ba40b1..3b66c72c1025 100644
--- a/services/core/jni/Android.bp
+++ b/services/core/jni/Android.bp
@@ -124,6 +124,7 @@ cc_defaults {
"android.hardware.thermal@1.0",
"android.hardware.tv.cec@1.0",
"android.hardware.tv.input@1.0",
+ "android.hardware.vibrator-cpp",
"android.hardware.vibrator@1.0",
"android.hardware.vibrator@1.1",
"android.hardware.vibrator@1.2",
@@ -133,7 +134,6 @@ cc_defaults {
"android.frameworks.sensorservice@1.0",
"android.system.suspend@1.0",
"suspend_control_aidl_interface-cpp",
- "vintf-vibrator-cpp",
],
static_libs: [