Merge "libhwbinder benchmark interface."
diff --git a/nfc/1.0/INfc.hal b/nfc/1.0/INfc.hal
index a1dc247..c99af13 100644
--- a/nfc/1.0/INfc.hal
+++ b/nfc/1.0/INfc.hal
@@ -2,6 +2,7 @@
 
 import INfcClientCallback;
 
+@hal_type(type="NFC")
 interface INfc {
     /*
      * Opens the NFC controller device and performs initialization.
diff --git a/nfc/1.0/INfcClientCallback.hal b/nfc/1.0/INfcClientCallback.hal
index 979728b..3e24b36 100644
--- a/nfc/1.0/INfcClientCallback.hal
+++ b/nfc/1.0/INfcClientCallback.hal
@@ -1,5 +1,6 @@
 package android.hardware.nfc@1.0;
 
+@hal_type(type="NFC")
 interface INfcClientCallback {
     /*
      * The callback passed in from the NFC stack that the HAL
diff --git a/update-makefiles.sh b/update-makefiles.sh
new file mode 100755
index 0000000..051e658
--- /dev/null
+++ b/update-makefiles.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+if [ ! -d hardware/interfaces ] ; then
+  echo "Where is hardware/interfaces?";
+  exit 1;
+fi
+
+packages=$(pushd hardware/interfaces > /dev/null; \
+           find -type f -name Android.mk -exec dirname {} \; | \
+           cut -c3- | \
+           awk -F'/' \
+                '{printf("android.hardware"); for(i=1;i<NF;i++){printf(".%s", $i);}; printf("@%s\n", $NF);}'; \
+           popd > /dev/null)
+
+for p in $packages; do
+  echo "Updating $p";
+  hidl-gen -Lmakefile -r android.hardware:hardware/interfaces $p;
+done