diff --git a/transport/memory/block/1.0/Android.bp b/transport/memory/block/1.0/Android.bp
index 0bb8a27..f26a6d3 100644
--- a/transport/memory/block/1.0/Android.bp
+++ b/transport/memory/block/1.0/Android.bp
@@ -10,7 +10,8 @@
         "types.hal",
     ],
     interfaces: [
+        "android.hidl.base@1.0",
         "android.hidl.memory.token@1.0",
     ],
-    gen_java: false,
+    gen_java: true,
 }
diff --git a/transport/memory/token/1.0/Android.bp b/transport/memory/token/1.0/Android.bp
index e6797d4..937e086 100644
--- a/transport/memory/token/1.0/Android.bp
+++ b/transport/memory/token/1.0/Android.bp
@@ -13,6 +13,5 @@
     interfaces: [
         "android.hidl.base@1.0",
     ],
-    gen_java: false,
+    gen_java: true,
 }
-
diff --git a/update-makefiles.sh b/update-makefiles.sh
index cf13c83..ef39487 100755
--- a/update-makefiles.sh
+++ b/update-makefiles.sh
@@ -1,17 +1,14 @@
 #!/bin/bash
+# Script to update Android make-files for HAL modules.
 
-packages=(
-    android.hidl.allocator@1.0
-    android.hidl.base@1.0
-    android.hidl.manager@1.0
-    android.hidl.manager@1.1
-    android.hidl.manager@1.2
-    android.hidl.memory@1.0
-    android.hidl.safe_union@1.0
-    android.hidl.token@1.0
-)
+set -e
 
-for package in "${packages[@]}"; do
-    echo "Updating $package."
-    hidl-gen -Landroidbp -r android.hidl:system/libhidl/transport $package
-done
+if [ -z "$ANDROID_BUILD_TOP" ]; then
+    echo "Missing ANDROID_BUILD_TOP env variable. Run 'lunch' first."
+    exit 1
+fi
+
+source $ANDROID_BUILD_TOP/system/tools/hidl/update-makefiles-helper.sh
+
+do_makefiles_update \
+  "android.hidl:system/libhidl/transport"