Merge changes from topic "adapter-features"
* changes:
Adapters: interface specific stop method
Adapters: allow adding a different instance name.
Adapters: Switch to struct of arguments.
diff --git a/transport/allocator/1.0/default/Android.bp b/transport/allocator/1.0/default/Android.bp
index fc352c3..1fdfb26 100644
--- a/transport/allocator/1.0/default/Android.bp
+++ b/transport/allocator/1.0/default/Android.bp
@@ -21,6 +21,7 @@
"service.cpp"
],
init_rc: ["android.hidl.allocator@1.0-service.rc"],
+ vintf_fragments: ["android.hidl.allocator@1.0-service.xml"],
shared_libs: [
"android.hidl.allocator@1.0",
diff --git a/transport/allocator/1.0/default/android.hidl.allocator@1.0-service.xml b/transport/allocator/1.0/default/android.hidl.allocator@1.0-service.xml
new file mode 100644
index 0000000..5218241
--- /dev/null
+++ b/transport/allocator/1.0/default/android.hidl.allocator@1.0-service.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="framework">
+ <hal>
+ <name>android.hidl.allocator</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IAllocator</name>
+ <instance>ashmem</instance>
+ </interface>
+ </hal>
+</manifest>
diff --git a/vintfdata/manifest.xml b/vintfdata/manifest.xml
index e20add5..3fc2067 100644
--- a/vintfdata/manifest.xml
+++ b/vintfdata/manifest.xml
@@ -9,15 +9,6 @@
</interface>
</hal>
<hal>
- <name>android.hidl.allocator</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IAllocator</name>
- <instance>ashmem</instance>
- </interface>
- </hal>
- <hal>
<name>android.hidl.memory</name>
<transport arch="32+64">passthrough</transport>
<version>1.0</version>