Merge "Add global definition of hidl_enum_iterator."
am: ca0328cf67
Change-Id: I576c2b3d133eba31644868361991fd0658308925
diff --git a/manifest.xml b/manifest.xml
index fdc9027..f34bfb1 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -89,4 +89,18 @@
<instance>vr</instance>
</interface>
</hal>
+ <hal format="native">
+ <name>netutils-wrapper</name>
+ <!--
+ netutils-wrapper versions must be x.0.
+ netutils-wrapper next version has less functionalities than
+ previous versions, so unlike a HAL, netutils-wrapper are not
+ backwards compatible. Hence the major version must be bumped for
+ each update.
+ If a minor version were bumped instead (say, <version>1.1</version>),
+ it would be incorrectly considered compatible with version 1.0 in
+ device compatibility matrix.
+ -->
+ <version>1.0</version>
+ </hal>
</manifest>
diff --git a/transport/current.txt b/transport/current.txt
index a6ecd81..958d679 100644
--- a/transport/current.txt
+++ b/transport/current.txt
@@ -11,3 +11,7 @@
2b885b5dec97391c82f35e64180686dc4c8f78b2b0a01732f8536385654f27c8 android.hidl.memory@1.0::IMapper
4632246017013e75536fa6ee47db286b24a323fb92c37c6b14bb0ab796b7a16b android.hidl.memory@1.0::IMemory
7c9fe352af04af659bd51ab6f5495115575bc063ddf684fc6d0dec1f4a4b4b7c android.hidl.token@1.0::ITokenManager
+
+# HALs released in Android O-MR1
+
+0b94dc876f749ed24a98f61c41d46ad75a27511163f1968a084213a33c684ef6 android.hidl.manager@1.1::IServiceManager