diff --git a/transport/base/1.0/Android.bp b/transport/base/1.0/Android.bp
index c169304..eb6b88f 100644
--- a/transport/base/1.0/Android.bp
+++ b/transport/base/1.0/Android.bp
@@ -1,5 +1,13 @@
 // This file is autogenerated by hidl-gen. Do not edit manually.
 
+filegroup {
+    name: "android.hidl.base@1.0_hal",
+    srcs: [
+        "types.hal",
+        "IBase.hal",
+    ],
+}
+
 genrule {
     name: "android.hidl.base@1.0_genc++",
     tools: ["hidl-gen"],
diff --git a/transport/base/1.0/Android.mk b/transport/base/1.0/Android.mk
index 0d2ff24..c4a1de9 100644
--- a/transport/base/1.0/Android.mk
+++ b/transport/base/1.0/Android.mk
@@ -8,7 +8,7 @@
 LOCAL_MODULE := android.hidl.base@1.0-java
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
 
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
 
@@ -58,7 +58,7 @@
 LOCAL_MODULE := android.hidl.base@1.0-java-static
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
 
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
 
diff --git a/transport/manager/1.0/Android.bp b/transport/manager/1.0/Android.bp
index c0ebdab..499b560 100644
--- a/transport/manager/1.0/Android.bp
+++ b/transport/manager/1.0/Android.bp
@@ -1,5 +1,13 @@
 // This file is autogenerated by hidl-gen. Do not edit manually.
 
+filegroup {
+    name: "android.hidl.manager@1.0_hal",
+    srcs: [
+        "IServiceManager.hal",
+        "IServiceNotification.hal",
+    ],
+}
+
 genrule {
     name: "android.hidl.manager@1.0_genc++",
     tools: ["hidl-gen"],
diff --git a/transport/manager/1.0/Android.mk b/transport/manager/1.0/Android.mk
index 27fc2a2..ce0947c 100644
--- a/transport/manager/1.0/Android.mk
+++ b/transport/manager/1.0/Android.mk
@@ -8,7 +8,7 @@
 LOCAL_MODULE := android.hidl.manager@1.0-java
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
 
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
 
@@ -62,7 +62,7 @@
 LOCAL_MODULE := android.hidl.manager@1.0-java-static
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
 
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
 
diff --git a/transport/memory/1.0/Android.bp b/transport/memory/1.0/Android.bp
index b2454ea..0a7b88f 100644
--- a/transport/memory/1.0/Android.bp
+++ b/transport/memory/1.0/Android.bp
@@ -1,5 +1,14 @@
 // This file is autogenerated by hidl-gen. Do not edit manually.
 
+filegroup {
+    name: "android.hidl.memory@1.0_hal",
+    srcs: [
+        "IAllocator.hal",
+        "IMapper.hal",
+        "IMemory.hal",
+    ],
+}
+
 genrule {
     name: "android.hidl.memory@1.0_genc++",
     tools: ["hidl-gen"],
diff --git a/transport/token/1.0/Android.bp b/transport/token/1.0/Android.bp
index 62b5dbc..ffa1c18 100644
--- a/transport/token/1.0/Android.bp
+++ b/transport/token/1.0/Android.bp
@@ -1,5 +1,12 @@
 // This file is autogenerated by hidl-gen. Do not edit manually.
 
+filegroup {
+    name: "android.hidl.token@1.0_hal",
+    srcs: [
+        "ITokenManager.hal",
+    ],
+}
+
 genrule {
     name: "android.hidl.token@1.0_genc++",
     tools: ["hidl-gen"],
diff --git a/transport/token/1.0/Android.mk b/transport/token/1.0/Android.mk
index 2e4a58d..fe2e7bf 100644
--- a/transport/token/1.0/Android.mk
+++ b/transport/token/1.0/Android.mk
@@ -8,7 +8,7 @@
 LOCAL_MODULE := android.hidl.token@1.0-java
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
 
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
 
@@ -42,7 +42,7 @@
 LOCAL_MODULE := android.hidl.token@1.0-java-static
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
 
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)