diff --git a/Android.bp b/Android.bp
index 6dfde33f5f..3cf3b3b788 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,4 @@
+// This is an autogenerated file, do not edit.
 subdirs = [
     "benchmarks/msgq/1.0",
     "nfc/1.0",
diff --git a/update-makefiles.sh b/update-makefiles.sh
index 567877e092..939a9c7125 100755
--- a/update-makefiles.sh
+++ b/update-makefiles.sh
@@ -17,3 +17,18 @@ for p in $packages; do
   hidl-gen -Lmakefile -r android.hardware:hardware/interfaces $p;
   hidl-gen -Landroidbp -r android.hardware:hardware/interfaces $p;
 done
+
+bp="hardware/interfaces/Android.bp"
+androidbps=$(find hardware/interfaces/*/      \
+             -name "Android.bp"               \
+             -exec dirname {} \;              \
+             | sort)
+
+echo "Updating $bp"
+
+echo "// This is an autogenerated file, do not edit." > $bp;
+echo "subdirs = [" >> $bp;
+for a in $androidbps; do
+  echo "    \"${a#*hardware/interfaces/}\"," >> $bp;
+done
+echo "]" >> $bp;
\ No newline at end of file