Merge "ServiceManager signals init to start lazy services"
diff --git a/cmds/atrace/Android.bp b/cmds/atrace/Android.bp
index cc2a6f7..e7d0ad0 100644
--- a/cmds/atrace/Android.bp
+++ b/cmds/atrace/Android.bp
@@ -10,9 +10,7 @@
shared_libs: [
"libbinder",
- "libhwbinder",
"libhidlbase",
- "libhidltransport",
"liblog",
"libutils",
"libcutils",
diff --git a/cmds/dumpstate/Android.bp b/cmds/dumpstate/Android.bp
index 93bbe90..519b13b 100644
--- a/cmds/dumpstate/Android.bp
+++ b/cmds/dumpstate/Android.bp
@@ -88,7 +88,6 @@
"libdumputils",
"libhardware_legacy",
"libhidlbase",
- "libhidltransport",
"liblog",
"libutils",
],
diff --git a/cmds/lshal/Android.bp b/cmds/lshal/Android.bp
index f8b8c68..5afae4b 100644
--- a/cmds/lshal/Android.bp
+++ b/cmds/lshal/Android.bp
@@ -19,7 +19,6 @@
"libcutils",
"libutils",
"libhidlbase",
- "libhidltransport",
"libhidl-gen-hash",
"libhidl-gen-utils",
"libvintf",
@@ -51,7 +50,6 @@
"libcutils",
"libutils",
"libhidlbase",
- "libhidltransport",
"libhidl-gen-hash",
"libhidl-gen-utils",
"libvintf",
@@ -81,9 +79,7 @@
"libgmock",
],
shared_libs: [
- "libhwbinder",
"libhidlbase",
- "libhidltransport",
"libvintf",
],
srcs: [
diff --git a/cmds/lshal/test.cpp b/cmds/lshal/test.cpp
index 76f7c7f..3d550ba 100644
--- a/cmds/lshal/test.cpp
+++ b/cmds/lshal/test.cpp
@@ -452,7 +452,7 @@
}
TEST_F(ListTest, DumpVintf) {
- const std::string expected = "<manifest version=\"1.0\" type=\"device\">\n"
+ const std::string expected = "<manifest version=\"2.0\" type=\"device\">\n"
" <hal format=\"hidl\">\n"
" <name>a.h.foo1</name>\n"
" <transport>hwbinder</transport>\n"
diff --git a/libs/dumputils/Android.bp b/libs/dumputils/Android.bp
index e23de8e..e403d36 100644
--- a/libs/dumputils/Android.bp
+++ b/libs/dumputils/Android.bp
@@ -18,7 +18,6 @@
shared_libs: [
"libbase",
"libhidlbase",
- "libhidltransport",
"liblog",
"libutils",
],
diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp
index 34575f5..59cb8e0 100644
--- a/libs/gui/Android.bp
+++ b/libs/gui/Android.bp
@@ -165,8 +165,6 @@
"libEGL",
"libGLESv2",
"libhidlbase",
- "libhidltransport",
- "libhwbinder",
"liblog",
"libnativewindow",
"libsync",
diff --git a/libs/gui/tests/Android.bp b/libs/gui/tests/Android.bp
index ab6dcaa..cbda6b2 100644
--- a/libs/gui/tests/Android.bp
+++ b/libs/gui/tests/Android.bp
@@ -47,7 +47,6 @@
"libcutils",
"libgui",
"libhidlbase",
- "libhidltransport",
"libinput",
"libui",
"libutils",
diff --git a/libs/sensor/OWNERS b/libs/sensor/OWNERS
index 81099e8..90c2330 100644
--- a/libs/sensor/OWNERS
+++ b/libs/sensor/OWNERS
@@ -1,3 +1,3 @@
arthuri@google.com
bduddie@google.com
-bstack@google.com
+stange@google.com
diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp
index 2cc6857..1a0d8c0 100644
--- a/libs/ui/Android.bp
+++ b/libs/ui/Android.bp
@@ -96,8 +96,6 @@
"libbase",
"libcutils",
"libhidlbase",
- "libhidltransport",
- "libhwbinder",
"libsync",
"libutils",
"liblog",
diff --git a/libs/ui/tests/Android.bp b/libs/ui/tests/Android.bp
index 373fa4f..99434b7 100644
--- a/libs/ui/tests/Android.bp
+++ b/libs/ui/tests/Android.bp
@@ -38,7 +38,6 @@
"android.frameworks.bufferhub@1.0",
"libcutils",
"libhidlbase",
- "libhwbinder",
"libui",
"libutils",
],
@@ -59,7 +58,6 @@
"android.frameworks.bufferhub@1.0",
"libcutils",
"libhidlbase",
- "libhwbinder",
"liblog",
"libui",
"libutils"
diff --git a/libs/vr/libvrflinger/Android.bp b/libs/vr/libvrflinger/Android.bp
index 2829353..12ce74b 100644
--- a/libs/vr/libvrflinger/Android.bp
+++ b/libs/vr/libvrflinger/Android.bp
@@ -57,7 +57,6 @@
"libgui",
"libsync",
"libhidlbase",
- "libhidltransport",
"libfmq",
"libpdx_default_transport",
]
diff --git a/opengl/libs/Android.bp b/opengl/libs/Android.bp
index abc7a72..342fb59 100644
--- a/opengl/libs/Android.bp
+++ b/opengl/libs/Android.bp
@@ -153,7 +153,6 @@
"android.hardware.configstore-utils",
"libbase",
"libhidlbase",
- "libhidltransport",
"libnativebridge_lazy",
"libnativeloader_lazy",
"libutils",
diff --git a/opengl/tests/EGLTest/Android.bp b/opengl/tests/EGLTest/Android.bp
index a9e873a..19c8b37 100644
--- a/opengl/tests/EGLTest/Android.bp
+++ b/opengl/tests/EGLTest/Android.bp
@@ -22,7 +22,6 @@
"libbinder",
"libgui",
"libhidlbase",
- "libhidltransport",
"liblog",
"libutils",
"libnativewindow",
diff --git a/services/bufferhub/Android.bp b/services/bufferhub/Android.bp
index cd03bc2..2bb6aef 100644
--- a/services/bufferhub/Android.bp
+++ b/services/bufferhub/Android.bp
@@ -37,8 +37,6 @@
"libcrypto",
"libcutils",
"libhidlbase",
- "libhidltransport",
- "libhwbinder",
"liblog",
"libui",
"libutils",
@@ -64,8 +62,6 @@
"libcrypto",
"libcutils",
"libhidlbase",
- "libhidltransport",
- "libhwbinder",
"liblog",
"libui",
"libutils",
diff --git a/services/displayservice/Android.bp b/services/displayservice/Android.bp
index 3442cb2..4d2d873 100644
--- a/services/displayservice/Android.bp
+++ b/services/displayservice/Android.bp
@@ -27,7 +27,6 @@
"liblog",
"libgui",
"libhidlbase",
- "libhidltransport",
"libutils",
"android.frameworks.displayservice@1.0",
],
diff --git a/services/schedulerservice/Android.bp b/services/schedulerservice/Android.bp
index 0227164..73802db 100644
--- a/services/schedulerservice/Android.bp
+++ b/services/schedulerservice/Android.bp
@@ -6,8 +6,6 @@
cflags: ["-Wall", "-Werror"],
shared_libs: [
"libhidlbase",
- "libhidltransport",
- "libhwbinder",
"libmediautils",
"liblog",
"libutils",
diff --git a/services/sensorservice/Android.bp b/services/sensorservice/Android.bp
index 33a2747..1c9a4af 100644
--- a/services/sensorservice/Android.bp
+++ b/services/sensorservice/Android.bp
@@ -45,8 +45,6 @@
"libcrypto",
"libbase",
"libhidlbase",
- "libhidltransport",
- "libhwbinder",
"libfmq",
"android.hardware.sensors@1.0",
"android.hardware.sensors@2.0",
diff --git a/services/sensorservice/OWNERS b/services/sensorservice/OWNERS
index 81099e8..90c2330 100644
--- a/services/sensorservice/OWNERS
+++ b/services/sensorservice/OWNERS
@@ -1,3 +1,3 @@
arthuri@google.com
bduddie@google.com
-bstack@google.com
+stange@google.com
diff --git a/services/sensorservice/hidl/Android.bp b/services/sensorservice/hidl/Android.bp
index 02c13fa..d0c83d6 100644
--- a/services/sensorservice/hidl/Android.bp
+++ b/services/sensorservice/hidl/Android.bp
@@ -13,8 +13,6 @@
shared_libs: [
"libbase",
"libhidlbase",
- "libhidltransport",
- "libhwbinder",
"libutils",
"libsensor",
"android.frameworks.sensorservice@1.0",
diff --git a/services/surfaceflinger/Android.bp b/services/surfaceflinger/Android.bp
index 9aa4e85..4f0695a 100644
--- a/services/surfaceflinger/Android.bp
+++ b/services/surfaceflinger/Android.bp
@@ -43,8 +43,6 @@
"libgui",
"libhardware",
"libhidlbase",
- "libhidltransport",
- "libhwbinder",
"liblayers_proto",
"liblog",
"libnativewindow",
@@ -85,8 +83,6 @@
"android.hardware.graphics.composer@2.3",
"android.hardware.power@1.3",
"libhidlbase",
- "libhidltransport",
- "libhwbinder",
],
}
@@ -199,7 +195,6 @@
"libcutils",
"libdisplayservicehidl",
"libhidlbase",
- "libhidltransport",
"libinput",
"liblayers_proto",
"liblog",
@@ -248,8 +243,6 @@
"android.hardware.configstore@1.1",
"android.hardware.graphics.common@1.2",
"libhidlbase",
- "libhidltransport",
- "libhwbinder",
"libui",
"libutils",
"liblog",
@@ -260,8 +253,6 @@
export_shared_lib_headers: [
"android.hardware.graphics.common@1.2",
"libhidlbase",
- "libhidltransport",
- "libhwbinder",
],
export_static_lib_headers: [
"SurfaceFlingerProperties",
diff --git a/services/surfaceflinger/tests/fakehwc/Android.bp b/services/surfaceflinger/tests/fakehwc/Android.bp
index a2c0611..2feff45 100644
--- a/services/surfaceflinger/tests/fakehwc/Android.bp
+++ b/services/surfaceflinger/tests/fakehwc/Android.bp
@@ -20,8 +20,6 @@
"libgui",
"libhardware",
"libhidlbase",
- "libhidltransport",
- "libhwbinder",
"liblayers_proto",
"liblog",
"libnativewindow",
diff --git a/services/vr/hardware_composer/Android.bp b/services/vr/hardware_composer/Android.bp
index 1604775..c202b5c 100644
--- a/services/vr/hardware_composer/Android.bp
+++ b/services/vr/hardware_composer/Android.bp
@@ -23,7 +23,6 @@
"libfmq",
"libhardware",
"libhidlbase",
- "libhidltransport",
"liblog",
"libsync",
"libui",
@@ -109,7 +108,6 @@
"libbinder",
"liblog",
"libhardware",
- "libhwbinder",
"libhidlbase",
"libui",
"libutils",
diff --git a/vulkan/libvulkan/Android.bp b/vulkan/libvulkan/Android.bp
index 993b751..df5f1eb 100644
--- a/vulkan/libvulkan/Android.bp
+++ b/vulkan/libvulkan/Android.bp
@@ -87,7 +87,6 @@
"libbase",
"libdl_android",
"libhidlbase",
- "libhidltransport",
"liblog",
"libui",
"libgraphicsenv",