diff --git a/OWNERS b/OWNERS
index 4929ba5..17c17c9 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,5 +1,3 @@
 yim@google.com
-trong@google.com
 zhuoyao@google.com
 yuexima@google.com
-ryanjcampbell@google.com
diff --git a/atrace/V1_0/build/Android.bp b/atrace/V1_0/build/Android.bp
index a1160fa..a9ae182 100644
--- a/atrace/V1_0/build/Android.bp
+++ b/atrace/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.atrace@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.atrace@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/atrace/1.0/ $(genDir)/android/hardware/atrace/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.atrace@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/atrace/1.0/ $(genDir)/android/hardware/atrace/1.0/",
     srcs: [
         ":android.hardware.atrace@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/atrace/1.0/AtraceDevice.vts.cpp",
         "android/hardware/atrace/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.atrace@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.atrace@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/atrace/1.0/ $(genDir)/android/hardware/atrace/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.atrace@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/atrace/1.0/ $(genDir)/android/hardware/atrace/1.0/",
     srcs: [
         ":android.hardware.atrace@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/atrace/1.0/AtraceDevice.vts.h",
         "android/hardware/atrace/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.atrace@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.atrace@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/atrace/1.0/ $(genDir)/android/hardware/atrace/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.atrace@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/atrace/1.0/ $(genDir)/android/hardware/atrace/1.0/",
     srcs: [
         ":android.hardware.atrace@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/atrace/1.0/AtraceDevice.vts.cpp",
         "android/hardware/atrace/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.atrace@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.atrace@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/atrace/1.0/ $(genDir)/android/hardware/atrace/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.atrace@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/atrace/1.0/ $(genDir)/android/hardware/atrace/1.0/",
     srcs: [
         ":android.hardware.atrace@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/atrace/1.0/AtraceDevice.vts.h",
         "android/hardware/atrace/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/audio/V2_0/build/Android.bp b/audio/V2_0/build/Android.bp
index 582150b..018f92d 100644
--- a/audio/V2_0/build/Android.bp
+++ b/audio/V2_0/build/Android.bp
@@ -24,7 +24,7 @@
 genrule {
     name: "android.hardware.audio@2.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/audio/2.0/ $(genDir)/android/hardware/audio/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/audio/2.0/ $(genDir)/android/hardware/audio/2.0/",
     srcs: [
         ":android.hardware.audio@2.0_hal",
     ],
@@ -38,12 +38,13 @@
         "android/hardware/audio/2.0/StreamOutCallback.vts.cpp",
         "android/hardware/audio/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.audio@2.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/audio/2.0/ $(genDir)/android/hardware/audio/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/audio/2.0/ $(genDir)/android/hardware/audio/2.0/",
     srcs: [
         ":android.hardware.audio@2.0_hal",
     ],
@@ -57,6 +58,7 @@
         "android/hardware/audio/2.0/StreamOutCallback.vts.h",
         "android/hardware/audio/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -78,7 +80,7 @@
 genrule {
     name: "android.hardware.audio@2.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/audio/2.0/ $(genDir)/android/hardware/audio/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/audio/2.0/ $(genDir)/android/hardware/audio/2.0/",
     srcs: [
         ":android.hardware.audio@2.0_hal",
     ],
@@ -92,12 +94,13 @@
         "android/hardware/audio/2.0/StreamOutCallback.vts.cpp",
         "android/hardware/audio/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.audio@2.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/audio/2.0/ $(genDir)/android/hardware/audio/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/audio/2.0/ $(genDir)/android/hardware/audio/2.0/",
     srcs: [
         ":android.hardware.audio@2.0_hal",
     ],
@@ -111,6 +114,7 @@
         "android/hardware/audio/2.0/StreamOutCallback.vts.h",
         "android/hardware/audio/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/audio/V4_0/build/Android.bp b/audio/V4_0/build/Android.bp
index 445ecb0..bfb1f51 100644
--- a/audio/V4_0/build/Android.bp
+++ b/audio/V4_0/build/Android.bp
@@ -24,7 +24,7 @@
 genrule {
     name: "android.hardware.audio@4.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio@4.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/audio/4.0/ $(genDir)/android/hardware/audio/4.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio@4.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/audio/4.0/ $(genDir)/android/hardware/audio/4.0/",
     srcs: [
         ":android.hardware.audio@4.0_hal",
     ],
@@ -38,12 +38,13 @@
         "android/hardware/audio/4.0/StreamOutCallback.vts.cpp",
         "android/hardware/audio/4.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.audio@4.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio@4.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/audio/4.0/ $(genDir)/android/hardware/audio/4.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio@4.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/audio/4.0/ $(genDir)/android/hardware/audio/4.0/",
     srcs: [
         ":android.hardware.audio@4.0_hal",
     ],
@@ -57,6 +58,7 @@
         "android/hardware/audio/4.0/StreamOutCallback.vts.h",
         "android/hardware/audio/4.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -78,7 +80,7 @@
 genrule {
     name: "android.hardware.audio@4.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio@4.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/audio/4.0/ $(genDir)/android/hardware/audio/4.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio@4.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/audio/4.0/ $(genDir)/android/hardware/audio/4.0/",
     srcs: [
         ":android.hardware.audio@4.0_hal",
     ],
@@ -92,12 +94,13 @@
         "android/hardware/audio/4.0/StreamOutCallback.vts.cpp",
         "android/hardware/audio/4.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.audio@4.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio@4.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/audio/4.0/ $(genDir)/android/hardware/audio/4.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio@4.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/audio/4.0/ $(genDir)/android/hardware/audio/4.0/",
     srcs: [
         ":android.hardware.audio@4.0_hal",
     ],
@@ -111,6 +114,7 @@
         "android/hardware/audio/4.0/StreamOutCallback.vts.h",
         "android/hardware/audio/4.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/audio/common/V2_0/build/Android.bp b/audio/common/V2_0/build/Android.bp
index fee6dff..3fa07fa 100644
--- a/audio/common/V2_0/build/Android.bp
+++ b/audio/common/V2_0/build/Android.bp
@@ -17,25 +17,27 @@
 genrule {
     name: "android.hardware.audio.common@2.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.common@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/audio/common/2.0/ $(genDir)/android/hardware/audio/common/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.common@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/audio/common/2.0/ $(genDir)/android/hardware/audio/common/2.0/",
     srcs: [
         ":android.hardware.audio.common@2.0_hal",
     ],
     out: [
         "android/hardware/audio/common/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.audio.common@2.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.common@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/audio/common/2.0/ $(genDir)/android/hardware/audio/common/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.common@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/audio/common/2.0/ $(genDir)/android/hardware/audio/common/2.0/",
     srcs: [
         ":android.hardware.audio.common@2.0_hal",
     ],
     out: [
         "android/hardware/audio/common/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -54,25 +56,27 @@
 genrule {
     name: "android.hardware.audio.common@2.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.common@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/audio/common/2.0/ $(genDir)/android/hardware/audio/common/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.common@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/audio/common/2.0/ $(genDir)/android/hardware/audio/common/2.0/",
     srcs: [
         ":android.hardware.audio.common@2.0_hal",
     ],
     out: [
         "android/hardware/audio/common/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.audio.common@2.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.common@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/audio/common/2.0/ $(genDir)/android/hardware/audio/common/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.common@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/audio/common/2.0/ $(genDir)/android/hardware/audio/common/2.0/",
     srcs: [
         ":android.hardware.audio.common@2.0_hal",
     ],
     out: [
         "android/hardware/audio/common/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/audio/common/V4_0/build/Android.bp b/audio/common/V4_0/build/Android.bp
index 4de2585..795697b 100644
--- a/audio/common/V4_0/build/Android.bp
+++ b/audio/common/V4_0/build/Android.bp
@@ -17,25 +17,27 @@
 genrule {
     name: "android.hardware.audio.common@4.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.common@4.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/audio/common/4.0/ $(genDir)/android/hardware/audio/common/4.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.common@4.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/audio/common/4.0/ $(genDir)/android/hardware/audio/common/4.0/",
     srcs: [
         ":android.hardware.audio.common@4.0_hal",
     ],
     out: [
         "android/hardware/audio/common/4.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.audio.common@4.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.common@4.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/audio/common/4.0/ $(genDir)/android/hardware/audio/common/4.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.common@4.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/audio/common/4.0/ $(genDir)/android/hardware/audio/common/4.0/",
     srcs: [
         ":android.hardware.audio.common@4.0_hal",
     ],
     out: [
         "android/hardware/audio/common/4.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -54,25 +56,27 @@
 genrule {
     name: "android.hardware.audio.common@4.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.common@4.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/audio/common/4.0/ $(genDir)/android/hardware/audio/common/4.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.common@4.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/audio/common/4.0/ $(genDir)/android/hardware/audio/common/4.0/",
     srcs: [
         ":android.hardware.audio.common@4.0_hal",
     ],
     out: [
         "android/hardware/audio/common/4.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.audio.common@4.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.common@4.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/audio/common/4.0/ $(genDir)/android/hardware/audio/common/4.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.common@4.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/audio/common/4.0/ $(genDir)/android/hardware/audio/common/4.0/",
     srcs: [
         ":android.hardware.audio.common@4.0_hal",
     ],
     out: [
         "android/hardware/audio/common/4.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/audio/effect/V2_0/build/Android.bp b/audio/effect/V2_0/build/Android.bp
index 7574b77..615f0c3 100644
--- a/audio/effect/V2_0/build/Android.bp
+++ b/audio/effect/V2_0/build/Android.bp
@@ -31,7 +31,7 @@
 genrule {
     name: "android.hardware.audio.effect@2.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.effect@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.effect@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
     srcs: [
         ":android.hardware.audio.effect@2.0_hal",
     ],
@@ -52,12 +52,13 @@
         "android/hardware/audio/effect/2.0/VisualizerEffect.vts.cpp",
         "android/hardware/audio/effect/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.audio.effect@2.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.effect@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.effect@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
     srcs: [
         ":android.hardware.audio.effect@2.0_hal",
     ],
@@ -78,6 +79,7 @@
         "android/hardware/audio/effect/2.0/VisualizerEffect.vts.h",
         "android/hardware/audio/effect/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -99,7 +101,7 @@
 genrule {
     name: "android.hardware.audio.effect@2.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.effect@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.effect@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
     srcs: [
         ":android.hardware.audio.effect@2.0_hal",
     ],
@@ -120,12 +122,13 @@
         "android/hardware/audio/effect/2.0/VisualizerEffect.vts.cpp",
         "android/hardware/audio/effect/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.audio.effect@2.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.effect@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.effect@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/audio/effect/2.0/ $(genDir)/android/hardware/audio/effect/2.0/",
     srcs: [
         ":android.hardware.audio.effect@2.0_hal",
     ],
@@ -146,6 +149,7 @@
         "android/hardware/audio/effect/2.0/VisualizerEffect.vts.h",
         "android/hardware/audio/effect/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/audio/effect/V4_0/build/Android.bp b/audio/effect/V4_0/build/Android.bp
index 75fd5fc..b955b82 100644
--- a/audio/effect/V4_0/build/Android.bp
+++ b/audio/effect/V4_0/build/Android.bp
@@ -31,7 +31,7 @@
 genrule {
     name: "android.hardware.audio.effect@4.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.effect@4.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/audio/effect/4.0/ $(genDir)/android/hardware/audio/effect/4.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.effect@4.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/audio/effect/4.0/ $(genDir)/android/hardware/audio/effect/4.0/",
     srcs: [
         ":android.hardware.audio.effect@4.0_hal",
     ],
@@ -52,12 +52,13 @@
         "android/hardware/audio/effect/4.0/VisualizerEffect.vts.cpp",
         "android/hardware/audio/effect/4.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.audio.effect@4.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.effect@4.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/audio/effect/4.0/ $(genDir)/android/hardware/audio/effect/4.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.effect@4.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/audio/effect/4.0/ $(genDir)/android/hardware/audio/effect/4.0/",
     srcs: [
         ":android.hardware.audio.effect@4.0_hal",
     ],
@@ -78,6 +79,7 @@
         "android/hardware/audio/effect/4.0/VisualizerEffect.vts.h",
         "android/hardware/audio/effect/4.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -99,7 +101,7 @@
 genrule {
     name: "android.hardware.audio.effect@4.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.effect@4.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/audio/effect/4.0/ $(genDir)/android/hardware/audio/effect/4.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.effect@4.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/audio/effect/4.0/ $(genDir)/android/hardware/audio/effect/4.0/",
     srcs: [
         ":android.hardware.audio.effect@4.0_hal",
     ],
@@ -120,12 +122,13 @@
         "android/hardware/audio/effect/4.0/VisualizerEffect.vts.cpp",
         "android/hardware/audio/effect/4.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.audio.effect@4.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.effect@4.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/audio/effect/4.0/ $(genDir)/android/hardware/audio/effect/4.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.audio.effect@4.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/audio/effect/4.0/ $(genDir)/android/hardware/audio/effect/4.0/",
     srcs: [
         ":android.hardware.audio.effect@4.0_hal",
     ],
@@ -146,6 +149,7 @@
         "android/hardware/audio/effect/4.0/VisualizerEffect.vts.h",
         "android/hardware/audio/effect/4.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/authsecret/V1_0/build/Android.bp b/authsecret/V1_0/build/Android.bp
index 9c9ada4..0f0b74a 100644
--- a/authsecret/V1_0/build/Android.bp
+++ b/authsecret/V1_0/build/Android.bp
@@ -17,25 +17,27 @@
 genrule {
     name: "android.hardware.authsecret@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.authsecret@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/authsecret/1.0/ $(genDir)/android/hardware/authsecret/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.authsecret@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/authsecret/1.0/ $(genDir)/android/hardware/authsecret/1.0/",
     srcs: [
         ":android.hardware.authsecret@1.0_hal",
     ],
     out: [
         "android/hardware/authsecret/1.0/AuthSecret.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.authsecret@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.authsecret@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/authsecret/1.0/ $(genDir)/android/hardware/authsecret/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.authsecret@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/authsecret/1.0/ $(genDir)/android/hardware/authsecret/1.0/",
     srcs: [
         ":android.hardware.authsecret@1.0_hal",
     ],
     out: [
         "android/hardware/authsecret/1.0/AuthSecret.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -54,25 +56,27 @@
 genrule {
     name: "android.hardware.authsecret@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.authsecret@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/authsecret/1.0/ $(genDir)/android/hardware/authsecret/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.authsecret@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/authsecret/1.0/ $(genDir)/android/hardware/authsecret/1.0/",
     srcs: [
         ":android.hardware.authsecret@1.0_hal",
     ],
     out: [
         "android/hardware/authsecret/1.0/AuthSecret.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.authsecret@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.authsecret@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/authsecret/1.0/ $(genDir)/android/hardware/authsecret/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.authsecret@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/authsecret/1.0/ $(genDir)/android/hardware/authsecret/1.0/",
     srcs: [
         ":android.hardware.authsecret@1.0_hal",
     ],
     out: [
         "android/hardware/authsecret/1.0/AuthSecret.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/automotive/audiocontrol/V1_0/build/Android.bp b/automotive/audiocontrol/V1_0/build/Android.bp
index b564d95..7e5e412 100644
--- a/automotive/audiocontrol/V1_0/build/Android.bp
+++ b/automotive/audiocontrol/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.automotive.audiocontrol@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.audiocontrol@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/automotive/audiocontrol/1.0/ $(genDir)/android/hardware/automotive/audiocontrol/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.audiocontrol@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/automotive/audiocontrol/1.0/ $(genDir)/android/hardware/automotive/audiocontrol/1.0/",
     srcs: [
         ":android.hardware.automotive.audiocontrol@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/automotive/audiocontrol/1.0/AudioControl.vts.cpp",
         "android/hardware/automotive/audiocontrol/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.automotive.audiocontrol@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.audiocontrol@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/automotive/audiocontrol/1.0/ $(genDir)/android/hardware/automotive/audiocontrol/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.audiocontrol@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/automotive/audiocontrol/1.0/ $(genDir)/android/hardware/automotive/audiocontrol/1.0/",
     srcs: [
         ":android.hardware.automotive.audiocontrol@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/automotive/audiocontrol/1.0/AudioControl.vts.h",
         "android/hardware/automotive/audiocontrol/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.automotive.audiocontrol@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.audiocontrol@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/automotive/audiocontrol/1.0/ $(genDir)/android/hardware/automotive/audiocontrol/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.audiocontrol@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/automotive/audiocontrol/1.0/ $(genDir)/android/hardware/automotive/audiocontrol/1.0/",
     srcs: [
         ":android.hardware.automotive.audiocontrol@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/automotive/audiocontrol/1.0/AudioControl.vts.cpp",
         "android/hardware/automotive/audiocontrol/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.automotive.audiocontrol@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.audiocontrol@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/automotive/audiocontrol/1.0/ $(genDir)/android/hardware/automotive/audiocontrol/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.audiocontrol@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/automotive/audiocontrol/1.0/ $(genDir)/android/hardware/automotive/audiocontrol/1.0/",
     srcs: [
         ":android.hardware.automotive.audiocontrol@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/automotive/audiocontrol/1.0/AudioControl.vts.h",
         "android/hardware/automotive/audiocontrol/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/automotive/evs/V1_0/build/Android.bp b/automotive/evs/V1_0/build/Android.bp
index b592c36..8f1cb53 100644
--- a/automotive/evs/V1_0/build/Android.bp
+++ b/automotive/evs/V1_0/build/Android.bp
@@ -21,7 +21,7 @@
 genrule {
     name: "android.hardware.automotive.evs@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.evs@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/automotive/evs/1.0/ $(genDir)/android/hardware/automotive/evs/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.evs@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/automotive/evs/1.0/ $(genDir)/android/hardware/automotive/evs/1.0/",
     srcs: [
         ":android.hardware.automotive.evs@1.0_hal",
     ],
@@ -32,12 +32,13 @@
         "android/hardware/automotive/evs/1.0/EvsEnumerator.vts.cpp",
         "android/hardware/automotive/evs/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.automotive.evs@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.evs@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/automotive/evs/1.0/ $(genDir)/android/hardware/automotive/evs/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.evs@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/automotive/evs/1.0/ $(genDir)/android/hardware/automotive/evs/1.0/",
     srcs: [
         ":android.hardware.automotive.evs@1.0_hal",
     ],
@@ -48,6 +49,7 @@
         "android/hardware/automotive/evs/1.0/EvsEnumerator.vts.h",
         "android/hardware/automotive/evs/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -66,7 +68,7 @@
 genrule {
     name: "android.hardware.automotive.evs@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.evs@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/automotive/evs/1.0/ $(genDir)/android/hardware/automotive/evs/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.evs@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/automotive/evs/1.0/ $(genDir)/android/hardware/automotive/evs/1.0/",
     srcs: [
         ":android.hardware.automotive.evs@1.0_hal",
     ],
@@ -77,12 +79,13 @@
         "android/hardware/automotive/evs/1.0/EvsEnumerator.vts.cpp",
         "android/hardware/automotive/evs/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.automotive.evs@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.evs@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/automotive/evs/1.0/ $(genDir)/android/hardware/automotive/evs/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.evs@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/automotive/evs/1.0/ $(genDir)/android/hardware/automotive/evs/1.0/",
     srcs: [
         ":android.hardware.automotive.evs@1.0_hal",
     ],
@@ -93,6 +96,7 @@
         "android/hardware/automotive/evs/1.0/EvsEnumerator.vts.h",
         "android/hardware/automotive/evs/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/automotive/vehicle/V2_0/build/Android.bp b/automotive/vehicle/V2_0/build/Android.bp
index 3110ccc..51b5dff 100644
--- a/automotive/vehicle/V2_0/build/Android.bp
+++ b/automotive/vehicle/V2_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.automotive.vehicle@2.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.vehicle@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/automotive/vehicle/2.0/ $(genDir)/android/hardware/automotive/vehicle/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.vehicle@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/automotive/vehicle/2.0/ $(genDir)/android/hardware/automotive/vehicle/2.0/",
     srcs: [
         ":android.hardware.automotive.vehicle@2.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/automotive/vehicle/2.0/VehicleCallback.vts.cpp",
         "android/hardware/automotive/vehicle/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.automotive.vehicle@2.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.vehicle@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/automotive/vehicle/2.0/ $(genDir)/android/hardware/automotive/vehicle/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.vehicle@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/automotive/vehicle/2.0/ $(genDir)/android/hardware/automotive/vehicle/2.0/",
     srcs: [
         ":android.hardware.automotive.vehicle@2.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/automotive/vehicle/2.0/VehicleCallback.vts.h",
         "android/hardware/automotive/vehicle/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.automotive.vehicle@2.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.vehicle@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/automotive/vehicle/2.0/ $(genDir)/android/hardware/automotive/vehicle/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.vehicle@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/automotive/vehicle/2.0/ $(genDir)/android/hardware/automotive/vehicle/2.0/",
     srcs: [
         ":android.hardware.automotive.vehicle@2.0_hal",
     ],
@@ -69,12 +71,13 @@
         "android/hardware/automotive/vehicle/2.0/VehicleCallback.vts.cpp",
         "android/hardware/automotive/vehicle/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.automotive.vehicle@2.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.vehicle@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/automotive/vehicle/2.0/ $(genDir)/android/hardware/automotive/vehicle/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.automotive.vehicle@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/automotive/vehicle/2.0/ $(genDir)/android/hardware/automotive/vehicle/2.0/",
     srcs: [
         ":android.hardware.automotive.vehicle@2.0_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/automotive/vehicle/2.0/VehicleCallback.vts.h",
         "android/hardware/automotive/vehicle/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/biometrics/fingerprint/V2_1/build/Android.bp b/biometrics/fingerprint/V2_1/build/Android.bp
index 92d9bab..1acac26 100644
--- a/biometrics/fingerprint/V2_1/build/Android.bp
+++ b/biometrics/fingerprint/V2_1/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.biometrics.fingerprint@2.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.biometrics.fingerprint@2.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/biometrics/fingerprint/2.1/ $(genDir)/android/hardware/biometrics/fingerprint/2.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.biometrics.fingerprint@2.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/biometrics/fingerprint/2.1/ $(genDir)/android/hardware/biometrics/fingerprint/2.1/",
     srcs: [
         ":android.hardware.biometrics.fingerprint@2.1_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/biometrics/fingerprint/2.1/BiometricsFingerprintClientCallback.vts.cpp",
         "android/hardware/biometrics/fingerprint/2.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.biometrics.fingerprint@2.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.biometrics.fingerprint@2.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/biometrics/fingerprint/2.1/ $(genDir)/android/hardware/biometrics/fingerprint/2.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.biometrics.fingerprint@2.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/biometrics/fingerprint/2.1/ $(genDir)/android/hardware/biometrics/fingerprint/2.1/",
     srcs: [
         ":android.hardware.biometrics.fingerprint@2.1_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/biometrics/fingerprint/2.1/BiometricsFingerprintClientCallback.vts.h",
         "android/hardware/biometrics/fingerprint/2.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.biometrics.fingerprint@2.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.biometrics.fingerprint@2.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/biometrics/fingerprint/2.1/ $(genDir)/android/hardware/biometrics/fingerprint/2.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.biometrics.fingerprint@2.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/biometrics/fingerprint/2.1/ $(genDir)/android/hardware/biometrics/fingerprint/2.1/",
     srcs: [
         ":android.hardware.biometrics.fingerprint@2.1_hal",
     ],
@@ -69,12 +71,13 @@
         "android/hardware/biometrics/fingerprint/2.1/BiometricsFingerprintClientCallback.vts.cpp",
         "android/hardware/biometrics/fingerprint/2.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.biometrics.fingerprint@2.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.biometrics.fingerprint@2.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/biometrics/fingerprint/2.1/ $(genDir)/android/hardware/biometrics/fingerprint/2.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.biometrics.fingerprint@2.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/biometrics/fingerprint/2.1/ $(genDir)/android/hardware/biometrics/fingerprint/2.1/",
     srcs: [
         ":android.hardware.biometrics.fingerprint@2.1_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/biometrics/fingerprint/2.1/BiometricsFingerprintClientCallback.vts.h",
         "android/hardware/biometrics/fingerprint/2.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/bluetooth/V1_0/build/Android.bp b/bluetooth/V1_0/build/Android.bp
index 850aedf..731edbc 100644
--- a/bluetooth/V1_0/build/Android.bp
+++ b/bluetooth/V1_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.bluetooth@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.bluetooth@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/bluetooth/1.0/ $(genDir)/android/hardware/bluetooth/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.bluetooth@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/bluetooth/1.0/ $(genDir)/android/hardware/bluetooth/1.0/",
     srcs: [
         ":android.hardware.bluetooth@1.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/bluetooth/1.0/BluetoothHciCallbacks.vts.cpp",
         "android/hardware/bluetooth/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.bluetooth@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.bluetooth@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/bluetooth/1.0/ $(genDir)/android/hardware/bluetooth/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.bluetooth@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/bluetooth/1.0/ $(genDir)/android/hardware/bluetooth/1.0/",
     srcs: [
         ":android.hardware.bluetooth@1.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/bluetooth/1.0/BluetoothHciCallbacks.vts.h",
         "android/hardware/bluetooth/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.bluetooth@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.bluetooth@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/bluetooth/1.0/ $(genDir)/android/hardware/bluetooth/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.bluetooth@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/bluetooth/1.0/ $(genDir)/android/hardware/bluetooth/1.0/",
     srcs: [
         ":android.hardware.bluetooth@1.0_hal",
     ],
@@ -69,12 +71,13 @@
         "android/hardware/bluetooth/1.0/BluetoothHciCallbacks.vts.cpp",
         "android/hardware/bluetooth/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.bluetooth@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.bluetooth@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/bluetooth/1.0/ $(genDir)/android/hardware/bluetooth/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.bluetooth@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/bluetooth/1.0/ $(genDir)/android/hardware/bluetooth/1.0/",
     srcs: [
         ":android.hardware.bluetooth@1.0_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/bluetooth/1.0/BluetoothHciCallbacks.vts.h",
         "android/hardware/bluetooth/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/bluetooth/a2dp/V1_0/build/Android.bp b/bluetooth/a2dp/V1_0/build/Android.bp
index deab3c9..10b0dc3 100644
--- a/bluetooth/a2dp/V1_0/build/Android.bp
+++ b/bluetooth/a2dp/V1_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.bluetooth.a2dp@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.bluetooth.a2dp@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/bluetooth/a2dp/1.0/ $(genDir)/android/hardware/bluetooth/a2dp/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.bluetooth.a2dp@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/bluetooth/a2dp/1.0/ $(genDir)/android/hardware/bluetooth/a2dp/1.0/",
     srcs: [
         ":android.hardware.bluetooth.a2dp@1.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/bluetooth/a2dp/1.0/BluetoothAudioOffload.vts.cpp",
         "android/hardware/bluetooth/a2dp/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.bluetooth.a2dp@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.bluetooth.a2dp@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/bluetooth/a2dp/1.0/ $(genDir)/android/hardware/bluetooth/a2dp/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.bluetooth.a2dp@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/bluetooth/a2dp/1.0/ $(genDir)/android/hardware/bluetooth/a2dp/1.0/",
     srcs: [
         ":android.hardware.bluetooth.a2dp@1.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/bluetooth/a2dp/1.0/BluetoothAudioOffload.vts.h",
         "android/hardware/bluetooth/a2dp/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.bluetooth.a2dp@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.bluetooth.a2dp@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/bluetooth/a2dp/1.0/ $(genDir)/android/hardware/bluetooth/a2dp/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.bluetooth.a2dp@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/bluetooth/a2dp/1.0/ $(genDir)/android/hardware/bluetooth/a2dp/1.0/",
     srcs: [
         ":android.hardware.bluetooth.a2dp@1.0_hal",
     ],
@@ -69,12 +71,13 @@
         "android/hardware/bluetooth/a2dp/1.0/BluetoothAudioOffload.vts.cpp",
         "android/hardware/bluetooth/a2dp/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.bluetooth.a2dp@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.bluetooth.a2dp@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/bluetooth/a2dp/1.0/ $(genDir)/android/hardware/bluetooth/a2dp/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.bluetooth.a2dp@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/bluetooth/a2dp/1.0/ $(genDir)/android/hardware/bluetooth/a2dp/1.0/",
     srcs: [
         ":android.hardware.bluetooth.a2dp@1.0_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/bluetooth/a2dp/1.0/BluetoothAudioOffload.vts.h",
         "android/hardware/bluetooth/a2dp/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/boot/V1_0/build/Android.bp b/boot/V1_0/build/Android.bp
index 34e3e57..ee89ce7 100644
--- a/boot/V1_0/build/Android.bp
+++ b/boot/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.boot@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.boot@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.boot@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/",
     srcs: [
         ":android.hardware.boot@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/boot/1.0/BootControl.vts.cpp",
         "android/hardware/boot/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.boot@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.boot@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.boot@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/",
     srcs: [
         ":android.hardware.boot@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/boot/1.0/BootControl.vts.h",
         "android/hardware/boot/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.boot@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.boot@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.boot@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/",
     srcs: [
         ":android.hardware.boot@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/boot/1.0/BootControl.vts.cpp",
         "android/hardware/boot/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.boot@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.boot@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.boot@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/boot/1.0/ $(genDir)/android/hardware/boot/1.0/",
     srcs: [
         ":android.hardware.boot@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/boot/1.0/BootControl.vts.h",
         "android/hardware/boot/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/broadcastradio/V1_0/build/Android.bp b/broadcastradio/V1_0/build/Android.bp
index 4fad9fd..b18702c 100644
--- a/broadcastradio/V1_0/build/Android.bp
+++ b/broadcastradio/V1_0/build/Android.bp
@@ -21,7 +21,7 @@
 genrule {
     name: "android.hardware.broadcastradio@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/broadcastradio/1.0/ $(genDir)/android/hardware/broadcastradio/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/broadcastradio/1.0/ $(genDir)/android/hardware/broadcastradio/1.0/",
     srcs: [
         ":android.hardware.broadcastradio@1.0_hal",
     ],
@@ -32,12 +32,13 @@
         "android/hardware/broadcastradio/1.0/TunerCallback.vts.cpp",
         "android/hardware/broadcastradio/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.broadcastradio@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/broadcastradio/1.0/ $(genDir)/android/hardware/broadcastradio/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/broadcastradio/1.0/ $(genDir)/android/hardware/broadcastradio/1.0/",
     srcs: [
         ":android.hardware.broadcastradio@1.0_hal",
     ],
@@ -48,6 +49,7 @@
         "android/hardware/broadcastradio/1.0/TunerCallback.vts.h",
         "android/hardware/broadcastradio/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -66,7 +68,7 @@
 genrule {
     name: "android.hardware.broadcastradio@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/broadcastradio/1.0/ $(genDir)/android/hardware/broadcastradio/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/broadcastradio/1.0/ $(genDir)/android/hardware/broadcastradio/1.0/",
     srcs: [
         ":android.hardware.broadcastradio@1.0_hal",
     ],
@@ -77,12 +79,13 @@
         "android/hardware/broadcastradio/1.0/TunerCallback.vts.cpp",
         "android/hardware/broadcastradio/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.broadcastradio@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/broadcastradio/1.0/ $(genDir)/android/hardware/broadcastradio/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/broadcastradio/1.0/ $(genDir)/android/hardware/broadcastradio/1.0/",
     srcs: [
         ":android.hardware.broadcastradio@1.0_hal",
     ],
@@ -93,6 +96,7 @@
         "android/hardware/broadcastradio/1.0/TunerCallback.vts.h",
         "android/hardware/broadcastradio/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/broadcastradio/V1_1/build/Android.bp b/broadcastradio/V1_1/build/Android.bp
index dc6f86f..45720bb 100644
--- a/broadcastradio/V1_1/build/Android.bp
+++ b/broadcastradio/V1_1/build/Android.bp
@@ -21,7 +21,7 @@
 genrule {
     name: "android.hardware.broadcastradio@1.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/broadcastradio/1.1/ $(genDir)/android/hardware/broadcastradio/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/broadcastradio/1.1/ $(genDir)/android/hardware/broadcastradio/1.1/",
     srcs: [
         ":android.hardware.broadcastradio@1.1_hal",
     ],
@@ -32,12 +32,13 @@
         "android/hardware/broadcastradio/1.1/TunerCallback.vts.cpp",
         "android/hardware/broadcastradio/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.broadcastradio@1.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/broadcastradio/1.1/ $(genDir)/android/hardware/broadcastradio/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/broadcastradio/1.1/ $(genDir)/android/hardware/broadcastradio/1.1/",
     srcs: [
         ":android.hardware.broadcastradio@1.1_hal",
     ],
@@ -48,6 +49,7 @@
         "android/hardware/broadcastradio/1.1/TunerCallback.vts.h",
         "android/hardware/broadcastradio/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -69,7 +71,7 @@
 genrule {
     name: "android.hardware.broadcastradio@1.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/broadcastradio/1.1/ $(genDir)/android/hardware/broadcastradio/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/broadcastradio/1.1/ $(genDir)/android/hardware/broadcastradio/1.1/",
     srcs: [
         ":android.hardware.broadcastradio@1.1_hal",
     ],
@@ -80,12 +82,13 @@
         "android/hardware/broadcastradio/1.1/TunerCallback.vts.cpp",
         "android/hardware/broadcastradio/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.broadcastradio@1.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/broadcastradio/1.1/ $(genDir)/android/hardware/broadcastradio/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/broadcastradio/1.1/ $(genDir)/android/hardware/broadcastradio/1.1/",
     srcs: [
         ":android.hardware.broadcastradio@1.1_hal",
     ],
@@ -96,6 +99,7 @@
         "android/hardware/broadcastradio/1.1/TunerCallback.vts.h",
         "android/hardware/broadcastradio/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/broadcastradio/V2_0/build/Android.bp b/broadcastradio/V2_0/build/Android.bp
index ce820aa..3446d3b 100644
--- a/broadcastradio/V2_0/build/Android.bp
+++ b/broadcastradio/V2_0/build/Android.bp
@@ -22,7 +22,7 @@
 genrule {
     name: "android.hardware.broadcastradio@2.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/broadcastradio/2.0/ $(genDir)/android/hardware/broadcastradio/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/broadcastradio/2.0/ $(genDir)/android/hardware/broadcastradio/2.0/",
     srcs: [
         ":android.hardware.broadcastradio@2.0_hal",
     ],
@@ -34,12 +34,13 @@
         "android/hardware/broadcastradio/2.0/TunerSession.vts.cpp",
         "android/hardware/broadcastradio/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.broadcastradio@2.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/broadcastradio/2.0/ $(genDir)/android/hardware/broadcastradio/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/broadcastradio/2.0/ $(genDir)/android/hardware/broadcastradio/2.0/",
     srcs: [
         ":android.hardware.broadcastradio@2.0_hal",
     ],
@@ -51,6 +52,7 @@
         "android/hardware/broadcastradio/2.0/TunerSession.vts.h",
         "android/hardware/broadcastradio/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -69,7 +71,7 @@
 genrule {
     name: "android.hardware.broadcastradio@2.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/broadcastradio/2.0/ $(genDir)/android/hardware/broadcastradio/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/broadcastradio/2.0/ $(genDir)/android/hardware/broadcastradio/2.0/",
     srcs: [
         ":android.hardware.broadcastradio@2.0_hal",
     ],
@@ -81,12 +83,13 @@
         "android/hardware/broadcastradio/2.0/TunerSession.vts.cpp",
         "android/hardware/broadcastradio/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.broadcastradio@2.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/broadcastradio/2.0/ $(genDir)/android/hardware/broadcastradio/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.broadcastradio@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/broadcastradio/2.0/ $(genDir)/android/hardware/broadcastradio/2.0/",
     srcs: [
         ":android.hardware.broadcastradio@2.0_hal",
     ],
@@ -98,6 +101,7 @@
         "android/hardware/broadcastradio/2.0/TunerSession.vts.h",
         "android/hardware/broadcastradio/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/camera/common/V1_0/build/Android.bp b/camera/common/V1_0/build/Android.bp
index 9271b1b..987e01f 100644
--- a/camera/common/V1_0/build/Android.bp
+++ b/camera/common/V1_0/build/Android.bp
@@ -17,25 +17,27 @@
 genrule {
     name: "android.hardware.camera.common@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.common@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/camera/common/1.0/ $(genDir)/android/hardware/camera/common/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.common@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/camera/common/1.0/ $(genDir)/android/hardware/camera/common/1.0/",
     srcs: [
         ":android.hardware.camera.common@1.0_hal",
     ],
     out: [
         "android/hardware/camera/common/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.camera.common@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.common@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/camera/common/1.0/ $(genDir)/android/hardware/camera/common/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.common@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/camera/common/1.0/ $(genDir)/android/hardware/camera/common/1.0/",
     srcs: [
         ":android.hardware.camera.common@1.0_hal",
     ],
     out: [
         "android/hardware/camera/common/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -54,25 +56,27 @@
 genrule {
     name: "android.hardware.camera.common@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.common@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/camera/common/1.0/ $(genDir)/android/hardware/camera/common/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.common@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/camera/common/1.0/ $(genDir)/android/hardware/camera/common/1.0/",
     srcs: [
         ":android.hardware.camera.common@1.0_hal",
     ],
     out: [
         "android/hardware/camera/common/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.camera.common@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.common@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/camera/common/1.0/ $(genDir)/android/hardware/camera/common/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.common@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/camera/common/1.0/ $(genDir)/android/hardware/camera/common/1.0/",
     srcs: [
         ":android.hardware.camera.common@1.0_hal",
     ],
     out: [
         "android/hardware/camera/common/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/camera/device/V1_0/build/Android.bp b/camera/device/V1_0/build/Android.bp
index 4283772..1efe0b2 100644
--- a/camera/device/V1_0/build/Android.bp
+++ b/camera/device/V1_0/build/Android.bp
@@ -20,7 +20,7 @@
 genrule {
     name: "android.hardware.camera.device@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/camera/device/1.0/ $(genDir)/android/hardware/camera/device/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/camera/device/1.0/ $(genDir)/android/hardware/camera/device/1.0/",
     srcs: [
         ":android.hardware.camera.device@1.0_hal",
     ],
@@ -30,12 +30,13 @@
         "android/hardware/camera/device/1.0/CameraDevicePreviewCallback.vts.cpp",
         "android/hardware/camera/device/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.camera.device@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/camera/device/1.0/ $(genDir)/android/hardware/camera/device/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/camera/device/1.0/ $(genDir)/android/hardware/camera/device/1.0/",
     srcs: [
         ":android.hardware.camera.device@1.0_hal",
     ],
@@ -45,6 +46,7 @@
         "android/hardware/camera/device/1.0/CameraDevicePreviewCallback.vts.h",
         "android/hardware/camera/device/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -68,7 +70,7 @@
 genrule {
     name: "android.hardware.camera.device@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/camera/device/1.0/ $(genDir)/android/hardware/camera/device/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/camera/device/1.0/ $(genDir)/android/hardware/camera/device/1.0/",
     srcs: [
         ":android.hardware.camera.device@1.0_hal",
     ],
@@ -78,12 +80,13 @@
         "android/hardware/camera/device/1.0/CameraDevicePreviewCallback.vts.cpp",
         "android/hardware/camera/device/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.camera.device@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/camera/device/1.0/ $(genDir)/android/hardware/camera/device/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/camera/device/1.0/ $(genDir)/android/hardware/camera/device/1.0/",
     srcs: [
         ":android.hardware.camera.device@1.0_hal",
     ],
@@ -93,6 +96,7 @@
         "android/hardware/camera/device/1.0/CameraDevicePreviewCallback.vts.h",
         "android/hardware/camera/device/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/camera/device/V3_2/build/Android.bp b/camera/device/V3_2/build/Android.bp
index ab6e27e..edc7dab 100644
--- a/camera/device/V3_2/build/Android.bp
+++ b/camera/device/V3_2/build/Android.bp
@@ -20,7 +20,7 @@
 genrule {
     name: "android.hardware.camera.device@3.2-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.2 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/camera/device/3.2/ $(genDir)/android/hardware/camera/device/3.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.2 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/camera/device/3.2/ $(genDir)/android/hardware/camera/device/3.2/",
     srcs: [
         ":android.hardware.camera.device@3.2_hal",
     ],
@@ -30,12 +30,13 @@
         "android/hardware/camera/device/3.2/CameraDeviceSession.vts.cpp",
         "android/hardware/camera/device/3.2/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.camera.device@3.2-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.2 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/camera/device/3.2/ $(genDir)/android/hardware/camera/device/3.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.2 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/camera/device/3.2/ $(genDir)/android/hardware/camera/device/3.2/",
     srcs: [
         ":android.hardware.camera.device@3.2_hal",
     ],
@@ -45,6 +46,7 @@
         "android/hardware/camera/device/3.2/CameraDeviceSession.vts.h",
         "android/hardware/camera/device/3.2/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -68,7 +70,7 @@
 genrule {
     name: "android.hardware.camera.device@3.2-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.2 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/camera/device/3.2/ $(genDir)/android/hardware/camera/device/3.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.2 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/camera/device/3.2/ $(genDir)/android/hardware/camera/device/3.2/",
     srcs: [
         ":android.hardware.camera.device@3.2_hal",
     ],
@@ -78,12 +80,13 @@
         "android/hardware/camera/device/3.2/CameraDeviceSession.vts.cpp",
         "android/hardware/camera/device/3.2/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.camera.device@3.2-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.2 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/camera/device/3.2/ $(genDir)/android/hardware/camera/device/3.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.2 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/camera/device/3.2/ $(genDir)/android/hardware/camera/device/3.2/",
     srcs: [
         ":android.hardware.camera.device@3.2_hal",
     ],
@@ -93,6 +96,7 @@
         "android/hardware/camera/device/3.2/CameraDeviceSession.vts.h",
         "android/hardware/camera/device/3.2/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/camera/device/V3_3/adapter/Android.mk b/camera/device/V3_3/adapter/Android.mk
deleted file mode 100644
index 9957433..0000000
--- a/camera/device/V3_3/adapter/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VtsHalCameraDeviceV3_3Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/camera/device/V3_3/adapter
-include test/vts/tools/build/Android.host_config.mk
diff --git a/gnss/V1_1/adapter/Android.mk b/camera/device/V3_3/adapter/CtsCameraTestCases/Android.mk
similarity index 88%
copy from gnss/V1_1/adapter/Android.mk
copy to camera/device/V3_3/adapter/CtsCameraTestCases/Android.mk
index abfb48d..4528f08 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/camera/device/V3_3/adapter/CtsCameraTestCases/Android.mk
@@ -18,6 +18,5 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalCameraDeviceV3_3AdapterCtsCameraTestCases
 include test/vts/tools/build/Android.host_config.mk
diff --git a/camera/device/V3_3/adapter/AndroidTest.xml b/camera/device/V3_3/adapter/CtsCameraTestCases/AndroidTest.xml
similarity index 95%
copy from camera/device/V3_3/adapter/AndroidTest.xml
copy to camera/device/V3_3/adapter/CtsCameraTestCases/AndroidTest.xml
index 7c1728d..9865892 100644
--- a/camera/device/V3_3/adapter/AndroidTest.xml
+++ b/camera/device/V3_3/adapter/CtsCameraTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Config for VTS VtsHalCameraDeviceV3_3Adapter test cases">
+<configuration description="Config for VTS VtsHalCameraDeviceV3_3AdapterCtsCameraTestCases test cases">
     <option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
     <object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
         <option name="hal-package-name" value="android.hardware.camera.device@3.3"/>
@@ -27,5 +27,4 @@
         <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
     </test>
     <include name="CtsCameraTestCases.config"/>
-    <include name="CtsStatsdHostTestCases.config"/>
 </configuration>
diff --git a/gnss/V1_1/adapter/Android.mk b/camera/device/V3_3/adapter/CtsStatsdHostTestCases/Android.mk
similarity index 88%
copy from gnss/V1_1/adapter/Android.mk
copy to camera/device/V3_3/adapter/CtsStatsdHostTestCases/Android.mk
index abfb48d..201c4f2 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/camera/device/V3_3/adapter/CtsStatsdHostTestCases/Android.mk
@@ -18,6 +18,5 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalCameraDeviceV3_3AdapterCtsStatsdHostTestCases
 include test/vts/tools/build/Android.host_config.mk
diff --git a/camera/device/V3_3/adapter/AndroidTest.xml b/camera/device/V3_3/adapter/CtsStatsdHostTestCases/AndroidTest.xml
similarity index 95%
rename from camera/device/V3_3/adapter/AndroidTest.xml
rename to camera/device/V3_3/adapter/CtsStatsdHostTestCases/AndroidTest.xml
index 7c1728d..03a0f36 100644
--- a/camera/device/V3_3/adapter/AndroidTest.xml
+++ b/camera/device/V3_3/adapter/CtsStatsdHostTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Config for VTS VtsHalCameraDeviceV3_3Adapter test cases">
+<configuration description="Config for VTS VtsHalCameraDeviceV3_3AdapterCtsStatsdHostTestCases test cases">
     <option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
     <object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
         <option name="hal-package-name" value="android.hardware.camera.device@3.3"/>
@@ -26,6 +26,5 @@
         <option name="package" value="com.android.devicehealth.tests"/>
         <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
     </test>
-    <include name="CtsCameraTestCases.config"/>
     <include name="CtsStatsdHostTestCases.config"/>
 </configuration>
diff --git a/camera/device/V3_3/build/Android.bp b/camera/device/V3_3/build/Android.bp
index d69bc68..2ba4f82 100644
--- a/camera/device/V3_3/build/Android.bp
+++ b/camera/device/V3_3/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.camera.device@3.3-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.3 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/camera/device/3.3/ $(genDir)/android/hardware/camera/device/3.3/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.3 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/camera/device/3.3/ $(genDir)/android/hardware/camera/device/3.3/",
     srcs: [
         ":android.hardware.camera.device@3.3_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/camera/device/3.3/CameraDeviceSession.vts.cpp",
         "android/hardware/camera/device/3.3/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.camera.device@3.3-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.3 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/camera/device/3.3/ $(genDir)/android/hardware/camera/device/3.3/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.3 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/camera/device/3.3/ $(genDir)/android/hardware/camera/device/3.3/",
     srcs: [
         ":android.hardware.camera.device@3.3_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/camera/device/3.3/CameraDeviceSession.vts.h",
         "android/hardware/camera/device/3.3/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -64,7 +66,7 @@
 genrule {
     name: "android.hardware.camera.device@3.3-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.3 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/camera/device/3.3/ $(genDir)/android/hardware/camera/device/3.3/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.3 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/camera/device/3.3/ $(genDir)/android/hardware/camera/device/3.3/",
     srcs: [
         ":android.hardware.camera.device@3.3_hal",
     ],
@@ -72,12 +74,13 @@
         "android/hardware/camera/device/3.3/CameraDeviceSession.vts.cpp",
         "android/hardware/camera/device/3.3/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.camera.device@3.3-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.3 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/camera/device/3.3/ $(genDir)/android/hardware/camera/device/3.3/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.3 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/camera/device/3.3/ $(genDir)/android/hardware/camera/device/3.3/",
     srcs: [
         ":android.hardware.camera.device@3.3_hal",
     ],
@@ -85,6 +88,7 @@
         "android/hardware/camera/device/3.3/CameraDeviceSession.vts.h",
         "android/hardware/camera/device/3.3/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/camera/device/V3_4/build/Android.bp b/camera/device/V3_4/build/Android.bp
index a11acdb..43a61b5 100644
--- a/camera/device/V3_4/build/Android.bp
+++ b/camera/device/V3_4/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.camera.device@3.4-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.4 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/camera/device/3.4/ $(genDir)/android/hardware/camera/device/3.4/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.4 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/camera/device/3.4/ $(genDir)/android/hardware/camera/device/3.4/",
     srcs: [
         ":android.hardware.camera.device@3.4_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/camera/device/3.4/CameraDeviceSession.vts.cpp",
         "android/hardware/camera/device/3.4/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.camera.device@3.4-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.4 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/camera/device/3.4/ $(genDir)/android/hardware/camera/device/3.4/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.4 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/camera/device/3.4/ $(genDir)/android/hardware/camera/device/3.4/",
     srcs: [
         ":android.hardware.camera.device@3.4_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/camera/device/3.4/CameraDeviceSession.vts.h",
         "android/hardware/camera/device/3.4/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -69,7 +71,7 @@
 genrule {
     name: "android.hardware.camera.device@3.4-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.4 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/camera/device/3.4/ $(genDir)/android/hardware/camera/device/3.4/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.4 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/camera/device/3.4/ $(genDir)/android/hardware/camera/device/3.4/",
     srcs: [
         ":android.hardware.camera.device@3.4_hal",
     ],
@@ -78,12 +80,13 @@
         "android/hardware/camera/device/3.4/CameraDeviceSession.vts.cpp",
         "android/hardware/camera/device/3.4/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.camera.device@3.4-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.4 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/camera/device/3.4/ $(genDir)/android/hardware/camera/device/3.4/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.device@3.4 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/camera/device/3.4/ $(genDir)/android/hardware/camera/device/3.4/",
     srcs: [
         ":android.hardware.camera.device@3.4_hal",
     ],
@@ -92,6 +95,7 @@
         "android/hardware/camera/device/3.4/CameraDeviceSession.vts.h",
         "android/hardware/camera/device/3.4/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/camera/metadata/V3_2/build/Android.bp b/camera/metadata/V3_2/build/Android.bp
index 4b886ac..4047022 100644
--- a/camera/metadata/V3_2/build/Android.bp
+++ b/camera/metadata/V3_2/build/Android.bp
@@ -17,25 +17,27 @@
 genrule {
     name: "android.hardware.camera.metadata@3.2-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.metadata@3.2 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/camera/metadata/3.2/ $(genDir)/android/hardware/camera/metadata/3.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.metadata@3.2 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/camera/metadata/3.2/ $(genDir)/android/hardware/camera/metadata/3.2/",
     srcs: [
         ":android.hardware.camera.metadata@3.2_hal",
     ],
     out: [
         "android/hardware/camera/metadata/3.2/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.camera.metadata@3.2-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.metadata@3.2 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/camera/metadata/3.2/ $(genDir)/android/hardware/camera/metadata/3.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.metadata@3.2 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/camera/metadata/3.2/ $(genDir)/android/hardware/camera/metadata/3.2/",
     srcs: [
         ":android.hardware.camera.metadata@3.2_hal",
     ],
     out: [
         "android/hardware/camera/metadata/3.2/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -54,25 +56,27 @@
 genrule {
     name: "android.hardware.camera.metadata@3.2-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.metadata@3.2 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/camera/metadata/3.2/ $(genDir)/android/hardware/camera/metadata/3.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.metadata@3.2 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/camera/metadata/3.2/ $(genDir)/android/hardware/camera/metadata/3.2/",
     srcs: [
         ":android.hardware.camera.metadata@3.2_hal",
     ],
     out: [
         "android/hardware/camera/metadata/3.2/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.camera.metadata@3.2-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.metadata@3.2 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/camera/metadata/3.2/ $(genDir)/android/hardware/camera/metadata/3.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.metadata@3.2 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/camera/metadata/3.2/ $(genDir)/android/hardware/camera/metadata/3.2/",
     srcs: [
         ":android.hardware.camera.metadata@3.2_hal",
     ],
     out: [
         "android/hardware/camera/metadata/3.2/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/camera/metadata/V3_3/build/Android.bp b/camera/metadata/V3_3/build/Android.bp
index f454fe5..2c2c5b7 100644
--- a/camera/metadata/V3_3/build/Android.bp
+++ b/camera/metadata/V3_3/build/Android.bp
@@ -17,25 +17,27 @@
 genrule {
     name: "android.hardware.camera.metadata@3.3-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.metadata@3.3 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/camera/metadata/3.3/ $(genDir)/android/hardware/camera/metadata/3.3/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.metadata@3.3 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/camera/metadata/3.3/ $(genDir)/android/hardware/camera/metadata/3.3/",
     srcs: [
         ":android.hardware.camera.metadata@3.3_hal",
     ],
     out: [
         "android/hardware/camera/metadata/3.3/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.camera.metadata@3.3-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.metadata@3.3 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/camera/metadata/3.3/ $(genDir)/android/hardware/camera/metadata/3.3/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.metadata@3.3 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/camera/metadata/3.3/ $(genDir)/android/hardware/camera/metadata/3.3/",
     srcs: [
         ":android.hardware.camera.metadata@3.3_hal",
     ],
     out: [
         "android/hardware/camera/metadata/3.3/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,25 +59,27 @@
 genrule {
     name: "android.hardware.camera.metadata@3.3-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.metadata@3.3 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/camera/metadata/3.3/ $(genDir)/android/hardware/camera/metadata/3.3/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.metadata@3.3 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/camera/metadata/3.3/ $(genDir)/android/hardware/camera/metadata/3.3/",
     srcs: [
         ":android.hardware.camera.metadata@3.3_hal",
     ],
     out: [
         "android/hardware/camera/metadata/3.3/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.camera.metadata@3.3-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.metadata@3.3 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/camera/metadata/3.3/ $(genDir)/android/hardware/camera/metadata/3.3/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.metadata@3.3 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/camera/metadata/3.3/ $(genDir)/android/hardware/camera/metadata/3.3/",
     srcs: [
         ":android.hardware.camera.metadata@3.3_hal",
     ],
     out: [
         "android/hardware/camera/metadata/3.3/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/camera/provider/V2_4/build/Android.bp b/camera/provider/V2_4/build/Android.bp
index 2fea040..9fb1c85 100644
--- a/camera/provider/V2_4/build/Android.bp
+++ b/camera/provider/V2_4/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.camera.provider@2.4-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.provider@2.4 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/camera/provider/2.4/ $(genDir)/android/hardware/camera/provider/2.4/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.provider@2.4 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/camera/provider/2.4/ $(genDir)/android/hardware/camera/provider/2.4/",
     srcs: [
         ":android.hardware.camera.provider@2.4_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/camera/provider/2.4/CameraProvider.vts.cpp",
         "android/hardware/camera/provider/2.4/CameraProviderCallback.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.camera.provider@2.4-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.provider@2.4 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/camera/provider/2.4/ $(genDir)/android/hardware/camera/provider/2.4/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.provider@2.4 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/camera/provider/2.4/ $(genDir)/android/hardware/camera/provider/2.4/",
     srcs: [
         ":android.hardware.camera.provider@2.4_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/camera/provider/2.4/CameraProvider.vts.h",
         "android/hardware/camera/provider/2.4/CameraProviderCallback.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -66,7 +68,7 @@
 genrule {
     name: "android.hardware.camera.provider@2.4-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.provider@2.4 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/camera/provider/2.4/ $(genDir)/android/hardware/camera/provider/2.4/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.provider@2.4 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/camera/provider/2.4/ $(genDir)/android/hardware/camera/provider/2.4/",
     srcs: [
         ":android.hardware.camera.provider@2.4_hal",
     ],
@@ -74,12 +76,13 @@
         "android/hardware/camera/provider/2.4/CameraProvider.vts.cpp",
         "android/hardware/camera/provider/2.4/CameraProviderCallback.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.camera.provider@2.4-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.provider@2.4 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/camera/provider/2.4/ $(genDir)/android/hardware/camera/provider/2.4/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.camera.provider@2.4 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/camera/provider/2.4/ $(genDir)/android/hardware/camera/provider/2.4/",
     srcs: [
         ":android.hardware.camera.provider@2.4_hal",
     ],
@@ -87,6 +90,7 @@
         "android/hardware/camera/provider/2.4/CameraProvider.vts.h",
         "android/hardware/camera/provider/2.4/CameraProviderCallback.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/cas/V1_0/build/Android.bp b/cas/V1_0/build/Android.bp
index 2bacf73..0a6f53e 100644
--- a/cas/V1_0/build/Android.bp
+++ b/cas/V1_0/build/Android.bp
@@ -21,7 +21,7 @@
 genrule {
     name: "android.hardware.cas@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.cas@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/cas/1.0/ $(genDir)/android/hardware/cas/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.cas@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/cas/1.0/ $(genDir)/android/hardware/cas/1.0/",
     srcs: [
         ":android.hardware.cas@1.0_hal",
     ],
@@ -32,12 +32,13 @@
         "android/hardware/cas/1.0/MediaCasService.vts.cpp",
         "android/hardware/cas/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.cas@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.cas@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/cas/1.0/ $(genDir)/android/hardware/cas/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.cas@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/cas/1.0/ $(genDir)/android/hardware/cas/1.0/",
     srcs: [
         ":android.hardware.cas@1.0_hal",
     ],
@@ -48,6 +49,7 @@
         "android/hardware/cas/1.0/MediaCasService.vts.h",
         "android/hardware/cas/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -66,7 +68,7 @@
 genrule {
     name: "android.hardware.cas@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.cas@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/cas/1.0/ $(genDir)/android/hardware/cas/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.cas@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/cas/1.0/ $(genDir)/android/hardware/cas/1.0/",
     srcs: [
         ":android.hardware.cas@1.0_hal",
     ],
@@ -77,12 +79,13 @@
         "android/hardware/cas/1.0/MediaCasService.vts.cpp",
         "android/hardware/cas/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.cas@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.cas@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/cas/1.0/ $(genDir)/android/hardware/cas/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.cas@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/cas/1.0/ $(genDir)/android/hardware/cas/1.0/",
     srcs: [
         ":android.hardware.cas@1.0_hal",
     ],
@@ -93,6 +96,7 @@
         "android/hardware/cas/1.0/MediaCasService.vts.h",
         "android/hardware/cas/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/cas/native/V1_0/build/Android.bp b/cas/native/V1_0/build/Android.bp
index fdc65bf..69b1def 100644
--- a/cas/native/V1_0/build/Android.bp
+++ b/cas/native/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.cas.native@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.cas.native@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/cas/native/1.0/ $(genDir)/android/hardware/cas/native/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.cas.native@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/cas/native/1.0/ $(genDir)/android/hardware/cas/native/1.0/",
     srcs: [
         ":android.hardware.cas.native@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/cas/native/1.0/Descrambler.vts.cpp",
         "android/hardware/cas/native/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.cas.native@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.cas.native@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/cas/native/1.0/ $(genDir)/android/hardware/cas/native/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.cas.native@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/cas/native/1.0/ $(genDir)/android/hardware/cas/native/1.0/",
     srcs: [
         ":android.hardware.cas.native@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/cas/native/1.0/Descrambler.vts.h",
         "android/hardware/cas/native/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.cas.native@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.cas.native@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/cas/native/1.0/ $(genDir)/android/hardware/cas/native/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.cas.native@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/cas/native/1.0/ $(genDir)/android/hardware/cas/native/1.0/",
     srcs: [
         ":android.hardware.cas.native@1.0_hal",
     ],
@@ -68,12 +70,13 @@
         "android/hardware/cas/native/1.0/Descrambler.vts.cpp",
         "android/hardware/cas/native/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.cas.native@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.cas.native@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/cas/native/1.0/ $(genDir)/android/hardware/cas/native/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.cas.native@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/cas/native/1.0/ $(genDir)/android/hardware/cas/native/1.0/",
     srcs: [
         ":android.hardware.cas.native@1.0_hal",
     ],
@@ -81,6 +84,7 @@
         "android/hardware/cas/native/1.0/Descrambler.vts.h",
         "android/hardware/cas/native/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/configstore/V1_0/build/Android.bp b/configstore/V1_0/build/Android.bp
index 3a7754a..5a4ad42 100644
--- a/configstore/V1_0/build/Android.bp
+++ b/configstore/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.configstore@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.configstore@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/configstore/1.0/ $(genDir)/android/hardware/configstore/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.configstore@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/configstore/1.0/ $(genDir)/android/hardware/configstore/1.0/",
     srcs: [
         ":android.hardware.configstore@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/configstore/1.0/SurfaceFlingerConfigs.vts.cpp",
         "android/hardware/configstore/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.configstore@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.configstore@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/configstore/1.0/ $(genDir)/android/hardware/configstore/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.configstore@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/configstore/1.0/ $(genDir)/android/hardware/configstore/1.0/",
     srcs: [
         ":android.hardware.configstore@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/configstore/1.0/SurfaceFlingerConfigs.vts.h",
         "android/hardware/configstore/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.configstore@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.configstore@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/configstore/1.0/ $(genDir)/android/hardware/configstore/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.configstore@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/configstore/1.0/ $(genDir)/android/hardware/configstore/1.0/",
     srcs: [
         ":android.hardware.configstore@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/configstore/1.0/SurfaceFlingerConfigs.vts.cpp",
         "android/hardware/configstore/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.configstore@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.configstore@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/configstore/1.0/ $(genDir)/android/hardware/configstore/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.configstore@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/configstore/1.0/ $(genDir)/android/hardware/configstore/1.0/",
     srcs: [
         ":android.hardware.configstore@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/configstore/1.0/SurfaceFlingerConfigs.vts.h",
         "android/hardware/configstore/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/configstore/V1_1/build/Android.bp b/configstore/V1_1/build/Android.bp
index c5f74d1..1f9df66 100644
--- a/configstore/V1_1/build/Android.bp
+++ b/configstore/V1_1/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.configstore@1.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.configstore@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/configstore/1.1/ $(genDir)/android/hardware/configstore/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.configstore@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/configstore/1.1/ $(genDir)/android/hardware/configstore/1.1/",
     srcs: [
         ":android.hardware.configstore@1.1_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/configstore/1.1/SurfaceFlingerConfigs.vts.cpp",
         "android/hardware/configstore/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.configstore@1.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.configstore@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/configstore/1.1/ $(genDir)/android/hardware/configstore/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.configstore@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/configstore/1.1/ $(genDir)/android/hardware/configstore/1.1/",
     srcs: [
         ":android.hardware.configstore@1.1_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/configstore/1.1/SurfaceFlingerConfigs.vts.h",
         "android/hardware/configstore/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.configstore@1.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.configstore@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/configstore/1.1/ $(genDir)/android/hardware/configstore/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.configstore@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/configstore/1.1/ $(genDir)/android/hardware/configstore/1.1/",
     srcs: [
         ":android.hardware.configstore@1.1_hal",
     ],
@@ -68,12 +70,13 @@
         "android/hardware/configstore/1.1/SurfaceFlingerConfigs.vts.cpp",
         "android/hardware/configstore/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.configstore@1.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.configstore@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/configstore/1.1/ $(genDir)/android/hardware/configstore/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.configstore@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/configstore/1.1/ $(genDir)/android/hardware/configstore/1.1/",
     srcs: [
         ":android.hardware.configstore@1.1_hal",
     ],
@@ -81,6 +84,7 @@
         "android/hardware/configstore/1.1/SurfaceFlingerConfigs.vts.h",
         "android/hardware/configstore/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/confirmationui/V1_0/build/Android.bp b/confirmationui/V1_0/build/Android.bp
index caf0ad9..5bb880e 100644
--- a/confirmationui/V1_0/build/Android.bp
+++ b/confirmationui/V1_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.confirmationui@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.confirmationui@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/confirmationui/1.0/ $(genDir)/android/hardware/confirmationui/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.confirmationui@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/confirmationui/1.0/ $(genDir)/android/hardware/confirmationui/1.0/",
     srcs: [
         ":android.hardware.confirmationui@1.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/confirmationui/1.0/ConfirmationUI.vts.cpp",
         "android/hardware/confirmationui/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.confirmationui@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.confirmationui@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/confirmationui/1.0/ $(genDir)/android/hardware/confirmationui/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.confirmationui@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/confirmationui/1.0/ $(genDir)/android/hardware/confirmationui/1.0/",
     srcs: [
         ":android.hardware.confirmationui@1.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/confirmationui/1.0/ConfirmationUI.vts.h",
         "android/hardware/confirmationui/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -63,7 +65,7 @@
 genrule {
     name: "android.hardware.confirmationui@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.confirmationui@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/confirmationui/1.0/ $(genDir)/android/hardware/confirmationui/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.confirmationui@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/confirmationui/1.0/ $(genDir)/android/hardware/confirmationui/1.0/",
     srcs: [
         ":android.hardware.confirmationui@1.0_hal",
     ],
@@ -72,12 +74,13 @@
         "android/hardware/confirmationui/1.0/ConfirmationUI.vts.cpp",
         "android/hardware/confirmationui/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.confirmationui@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.confirmationui@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/confirmationui/1.0/ $(genDir)/android/hardware/confirmationui/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.confirmationui@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/confirmationui/1.0/ $(genDir)/android/hardware/confirmationui/1.0/",
     srcs: [
         ":android.hardware.confirmationui@1.0_hal",
     ],
@@ -86,6 +89,7 @@
         "android/hardware/confirmationui/1.0/ConfirmationUI.vts.h",
         "android/hardware/confirmationui/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/contexthub/V1_0/build/Android.bp b/contexthub/V1_0/build/Android.bp
index 102fcc8..2429d46 100644
--- a/contexthub/V1_0/build/Android.bp
+++ b/contexthub/V1_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.contexthub@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.contexthub@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/contexthub/1.0/ $(genDir)/android/hardware/contexthub/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.contexthub@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/contexthub/1.0/ $(genDir)/android/hardware/contexthub/1.0/",
     srcs: [
         ":android.hardware.contexthub@1.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/contexthub/1.0/ContexthubCallback.vts.cpp",
         "android/hardware/contexthub/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.contexthub@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.contexthub@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/contexthub/1.0/ $(genDir)/android/hardware/contexthub/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.contexthub@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/contexthub/1.0/ $(genDir)/android/hardware/contexthub/1.0/",
     srcs: [
         ":android.hardware.contexthub@1.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/contexthub/1.0/ContexthubCallback.vts.h",
         "android/hardware/contexthub/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.contexthub@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.contexthub@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/contexthub/1.0/ $(genDir)/android/hardware/contexthub/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.contexthub@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/contexthub/1.0/ $(genDir)/android/hardware/contexthub/1.0/",
     srcs: [
         ":android.hardware.contexthub@1.0_hal",
     ],
@@ -69,12 +71,13 @@
         "android/hardware/contexthub/1.0/ContexthubCallback.vts.cpp",
         "android/hardware/contexthub/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.contexthub@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.contexthub@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/contexthub/1.0/ $(genDir)/android/hardware/contexthub/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.contexthub@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/contexthub/1.0/ $(genDir)/android/hardware/contexthub/1.0/",
     srcs: [
         ":android.hardware.contexthub@1.0_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/contexthub/1.0/ContexthubCallback.vts.h",
         "android/hardware/contexthub/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/drm/V1_0/build/Android.bp b/drm/V1_0/build/Android.bp
index 4cee58f..b213dbf 100644
--- a/drm/V1_0/build/Android.bp
+++ b/drm/V1_0/build/Android.bp
@@ -22,7 +22,7 @@
 genrule {
     name: "android.hardware.drm@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.drm@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.drm@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
     srcs: [
         ":android.hardware.drm@1.0_hal",
     ],
@@ -34,12 +34,13 @@
         "android/hardware/drm/1.0/DrmPluginListener.vts.cpp",
         "android/hardware/drm/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.drm@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.drm@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.drm@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
     srcs: [
         ":android.hardware.drm@1.0_hal",
     ],
@@ -51,6 +52,7 @@
         "android/hardware/drm/1.0/DrmPluginListener.vts.h",
         "android/hardware/drm/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -69,7 +71,7 @@
 genrule {
     name: "android.hardware.drm@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.drm@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.drm@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
     srcs: [
         ":android.hardware.drm@1.0_hal",
     ],
@@ -81,12 +83,13 @@
         "android/hardware/drm/1.0/DrmPluginListener.vts.cpp",
         "android/hardware/drm/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.drm@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.drm@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.drm@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/drm/1.0/ $(genDir)/android/hardware/drm/1.0/",
     srcs: [
         ":android.hardware.drm@1.0_hal",
     ],
@@ -98,6 +101,7 @@
         "android/hardware/drm/1.0/DrmPluginListener.vts.h",
         "android/hardware/drm/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/drm/V1_1/build/Android.bp b/drm/V1_1/build/Android.bp
index b504e38..14dcef5 100644
--- a/drm/V1_1/build/Android.bp
+++ b/drm/V1_1/build/Android.bp
@@ -20,7 +20,7 @@
 genrule {
     name: "android.hardware.drm@1.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.drm@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/drm/1.1/ $(genDir)/android/hardware/drm/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.drm@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/drm/1.1/ $(genDir)/android/hardware/drm/1.1/",
     srcs: [
         ":android.hardware.drm@1.1_hal",
     ],
@@ -30,12 +30,13 @@
         "android/hardware/drm/1.1/DrmPlugin.vts.cpp",
         "android/hardware/drm/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.drm@1.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.drm@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/drm/1.1/ $(genDir)/android/hardware/drm/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.drm@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/drm/1.1/ $(genDir)/android/hardware/drm/1.1/",
     srcs: [
         ":android.hardware.drm@1.1_hal",
     ],
@@ -45,6 +46,7 @@
         "android/hardware/drm/1.1/DrmPlugin.vts.h",
         "android/hardware/drm/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -66,7 +68,7 @@
 genrule {
     name: "android.hardware.drm@1.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.drm@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/drm/1.1/ $(genDir)/android/hardware/drm/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.drm@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/drm/1.1/ $(genDir)/android/hardware/drm/1.1/",
     srcs: [
         ":android.hardware.drm@1.1_hal",
     ],
@@ -76,12 +78,13 @@
         "android/hardware/drm/1.1/DrmPlugin.vts.cpp",
         "android/hardware/drm/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.drm@1.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.drm@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/drm/1.1/ $(genDir)/android/hardware/drm/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.drm@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/drm/1.1/ $(genDir)/android/hardware/drm/1.1/",
     srcs: [
         ":android.hardware.drm@1.1_hal",
     ],
@@ -91,6 +94,7 @@
         "android/hardware/drm/1.1/DrmPlugin.vts.h",
         "android/hardware/drm/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/dumpstate/V1_0/build/Android.bp b/dumpstate/V1_0/build/Android.bp
index ac72639..128a0f2 100644
--- a/dumpstate/V1_0/build/Android.bp
+++ b/dumpstate/V1_0/build/Android.bp
@@ -17,25 +17,27 @@
 genrule {
     name: "android.hardware.dumpstate@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.dumpstate@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/dumpstate/1.0/ $(genDir)/android/hardware/dumpstate/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.dumpstate@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/dumpstate/1.0/ $(genDir)/android/hardware/dumpstate/1.0/",
     srcs: [
         ":android.hardware.dumpstate@1.0_hal",
     ],
     out: [
         "android/hardware/dumpstate/1.0/DumpstateDevice.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.dumpstate@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.dumpstate@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/dumpstate/1.0/ $(genDir)/android/hardware/dumpstate/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.dumpstate@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/dumpstate/1.0/ $(genDir)/android/hardware/dumpstate/1.0/",
     srcs: [
         ":android.hardware.dumpstate@1.0_hal",
     ],
     out: [
         "android/hardware/dumpstate/1.0/DumpstateDevice.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -54,25 +56,27 @@
 genrule {
     name: "android.hardware.dumpstate@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.dumpstate@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/dumpstate/1.0/ $(genDir)/android/hardware/dumpstate/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.dumpstate@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/dumpstate/1.0/ $(genDir)/android/hardware/dumpstate/1.0/",
     srcs: [
         ":android.hardware.dumpstate@1.0_hal",
     ],
     out: [
         "android/hardware/dumpstate/1.0/DumpstateDevice.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.dumpstate@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.dumpstate@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/dumpstate/1.0/ $(genDir)/android/hardware/dumpstate/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.dumpstate@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/dumpstate/1.0/ $(genDir)/android/hardware/dumpstate/1.0/",
     srcs: [
         ":android.hardware.dumpstate@1.0_hal",
     ],
     out: [
         "android/hardware/dumpstate/1.0/DumpstateDevice.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/fastboot/V1_0/build/Android.bp b/fastboot/V1_0/build/Android.bp
index 9b64dfa..ffe8fc3 100644
--- a/fastboot/V1_0/build/Android.bp
+++ b/fastboot/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.fastboot@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.fastboot@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/fastboot/1.0/ $(genDir)/android/hardware/fastboot/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.fastboot@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/fastboot/1.0/ $(genDir)/android/hardware/fastboot/1.0/",
     srcs: [
         ":android.hardware.fastboot@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/fastboot/1.0/Fastboot.vts.cpp",
         "android/hardware/fastboot/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.fastboot@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.fastboot@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/fastboot/1.0/ $(genDir)/android/hardware/fastboot/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.fastboot@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/fastboot/1.0/ $(genDir)/android/hardware/fastboot/1.0/",
     srcs: [
         ":android.hardware.fastboot@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/fastboot/1.0/Fastboot.vts.h",
         "android/hardware/fastboot/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.fastboot@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.fastboot@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/fastboot/1.0/ $(genDir)/android/hardware/fastboot/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.fastboot@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/fastboot/1.0/ $(genDir)/android/hardware/fastboot/1.0/",
     srcs: [
         ":android.hardware.fastboot@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/fastboot/1.0/Fastboot.vts.cpp",
         "android/hardware/fastboot/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.fastboot@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.fastboot@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/fastboot/1.0/ $(genDir)/android/hardware/fastboot/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.fastboot@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/fastboot/1.0/ $(genDir)/android/hardware/fastboot/1.0/",
     srcs: [
         ":android.hardware.fastboot@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/fastboot/1.0/Fastboot.vts.h",
         "android/hardware/fastboot/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/gatekeeper/V1_0/build/Android.bp b/gatekeeper/V1_0/build/Android.bp
index 7ace62f..8a86724 100644
--- a/gatekeeper/V1_0/build/Android.bp
+++ b/gatekeeper/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.gatekeeper@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gatekeeper@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/gatekeeper/1.0/ $(genDir)/android/hardware/gatekeeper/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gatekeeper@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/gatekeeper/1.0/ $(genDir)/android/hardware/gatekeeper/1.0/",
     srcs: [
         ":android.hardware.gatekeeper@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/gatekeeper/1.0/Gatekeeper.vts.cpp",
         "android/hardware/gatekeeper/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.gatekeeper@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gatekeeper@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/gatekeeper/1.0/ $(genDir)/android/hardware/gatekeeper/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gatekeeper@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/gatekeeper/1.0/ $(genDir)/android/hardware/gatekeeper/1.0/",
     srcs: [
         ":android.hardware.gatekeeper@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/gatekeeper/1.0/Gatekeeper.vts.h",
         "android/hardware/gatekeeper/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.gatekeeper@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gatekeeper@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/gatekeeper/1.0/ $(genDir)/android/hardware/gatekeeper/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gatekeeper@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/gatekeeper/1.0/ $(genDir)/android/hardware/gatekeeper/1.0/",
     srcs: [
         ":android.hardware.gatekeeper@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/gatekeeper/1.0/Gatekeeper.vts.cpp",
         "android/hardware/gatekeeper/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.gatekeeper@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gatekeeper@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/gatekeeper/1.0/ $(genDir)/android/hardware/gatekeeper/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gatekeeper@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/gatekeeper/1.0/ $(genDir)/android/hardware/gatekeeper/1.0/",
     srcs: [
         ":android.hardware.gatekeeper@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/gatekeeper/1.0/Gatekeeper.vts.h",
         "android/hardware/gatekeeper/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/gnss/V1_0/build/Android.bp b/gnss/V1_0/build/Android.bp
index 58e4549..6af14bd 100644
--- a/gnss/V1_0/build/Android.bp
+++ b/gnss/V1_0/build/Android.bp
@@ -37,7 +37,7 @@
 genrule {
     name: "android.hardware.gnss@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gnss@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gnss@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
     srcs: [
         ":android.hardware.gnss@1.0_hal",
     ],
@@ -64,12 +64,13 @@
         "android/hardware/gnss/1.0/GnssXtraCallback.vts.cpp",
         "android/hardware/gnss/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.gnss@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gnss@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gnss@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
     srcs: [
         ":android.hardware.gnss@1.0_hal",
     ],
@@ -96,6 +97,7 @@
         "android/hardware/gnss/1.0/GnssXtraCallback.vts.h",
         "android/hardware/gnss/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -114,7 +116,7 @@
 genrule {
     name: "android.hardware.gnss@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gnss@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gnss@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
     srcs: [
         ":android.hardware.gnss@1.0_hal",
     ],
@@ -141,12 +143,13 @@
         "android/hardware/gnss/1.0/GnssXtraCallback.vts.cpp",
         "android/hardware/gnss/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.gnss@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gnss@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gnss@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
     srcs: [
         ":android.hardware.gnss@1.0_hal",
     ],
@@ -173,6 +176,7 @@
         "android/hardware/gnss/1.0/GnssXtraCallback.vts.h",
         "android/hardware/gnss/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/gnss/V1_1/adapter/Android.mk b/gnss/V1_1/adapter/CtsLocationTestCases/Android.mk
similarity index 88%
copy from gnss/V1_1/adapter/Android.mk
copy to gnss/V1_1/adapter/CtsLocationTestCases/Android.mk
index abfb48d..cdc1717 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/gnss/V1_1/adapter/CtsLocationTestCases/Android.mk
@@ -18,6 +18,5 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalGnssV1_1AdapterCtsLocationTestCases
 include test/vts/tools/build/Android.host_config.mk
diff --git a/gnss/V1_1/adapter/AndroidTest.xml b/gnss/V1_1/adapter/CtsLocationTestCases/AndroidTest.xml
similarity index 95%
rename from gnss/V1_1/adapter/AndroidTest.xml
rename to gnss/V1_1/adapter/CtsLocationTestCases/AndroidTest.xml
index 8b431f2..f1fbc7c 100644
--- a/gnss/V1_1/adapter/AndroidTest.xml
+++ b/gnss/V1_1/adapter/CtsLocationTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Config for VTS VtsHalGnssV1_1Adapter test cases">
+<configuration description="Config for VTS VtsHalGnssV1_1AdapterCtsLocationTestCases test cases">
     <option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
     <object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
         <option name="hal-package-name" value="android.hardware.gnss@1.1"/>
@@ -27,5 +27,4 @@
         <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
     </test>
     <include name="CtsLocationTestCases.config"/>
-    <include name="CtsStatsdHostTestCases.config"/>
 </configuration>
diff --git a/gnss/V1_1/adapter/Android.mk b/gnss/V1_1/adapter/CtsStatsdHostTestCases/Android.mk
similarity index 88%
copy from gnss/V1_1/adapter/Android.mk
copy to gnss/V1_1/adapter/CtsStatsdHostTestCases/Android.mk
index abfb48d..57cd8e6 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/gnss/V1_1/adapter/CtsStatsdHostTestCases/Android.mk
@@ -18,6 +18,5 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalGnssV1_1AdapterCtsStatsdHostTestCases
 include test/vts/tools/build/Android.host_config.mk
diff --git a/gnss/V1_1/adapter/AndroidTest.xml b/gnss/V1_1/adapter/CtsStatsdHostTestCases/AndroidTest.xml
similarity index 95%
copy from gnss/V1_1/adapter/AndroidTest.xml
copy to gnss/V1_1/adapter/CtsStatsdHostTestCases/AndroidTest.xml
index 8b431f2..cd27599 100644
--- a/gnss/V1_1/adapter/AndroidTest.xml
+++ b/gnss/V1_1/adapter/CtsStatsdHostTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Config for VTS VtsHalGnssV1_1Adapter test cases">
+<configuration description="Config for VTS VtsHalGnssV1_1AdapterCtsStatsdHostTestCases test cases">
     <option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
     <object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
         <option name="hal-package-name" value="android.hardware.gnss@1.1"/>
@@ -26,6 +26,5 @@
         <option name="package" value="com.android.devicehealth.tests"/>
         <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
     </test>
-    <include name="CtsLocationTestCases.config"/>
     <include name="CtsStatsdHostTestCases.config"/>
 </configuration>
diff --git a/gnss/V1_1/build/Android.bp b/gnss/V1_1/build/Android.bp
index 64ed9fb..2313fc5 100644
--- a/gnss/V1_1/build/Android.bp
+++ b/gnss/V1_1/build/Android.bp
@@ -21,7 +21,7 @@
 genrule {
     name: "android.hardware.gnss@1.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gnss@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/gnss/1.1/ $(genDir)/android/hardware/gnss/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gnss@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/gnss/1.1/ $(genDir)/android/hardware/gnss/1.1/",
     srcs: [
         ":android.hardware.gnss@1.1_hal",
     ],
@@ -32,12 +32,13 @@
         "android/hardware/gnss/1.1/GnssMeasurement.vts.cpp",
         "android/hardware/gnss/1.1/GnssMeasurementCallback.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.gnss@1.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gnss@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/gnss/1.1/ $(genDir)/android/hardware/gnss/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gnss@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/gnss/1.1/ $(genDir)/android/hardware/gnss/1.1/",
     srcs: [
         ":android.hardware.gnss@1.1_hal",
     ],
@@ -48,6 +49,7 @@
         "android/hardware/gnss/1.1/GnssMeasurement.vts.h",
         "android/hardware/gnss/1.1/GnssMeasurementCallback.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -69,7 +71,7 @@
 genrule {
     name: "android.hardware.gnss@1.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gnss@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/gnss/1.1/ $(genDir)/android/hardware/gnss/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gnss@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/gnss/1.1/ $(genDir)/android/hardware/gnss/1.1/",
     srcs: [
         ":android.hardware.gnss@1.1_hal",
     ],
@@ -80,12 +82,13 @@
         "android/hardware/gnss/1.1/GnssMeasurement.vts.cpp",
         "android/hardware/gnss/1.1/GnssMeasurementCallback.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.gnss@1.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gnss@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/gnss/1.1/ $(genDir)/android/hardware/gnss/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.gnss@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/gnss/1.1/ $(genDir)/android/hardware/gnss/1.1/",
     srcs: [
         ":android.hardware.gnss@1.1_hal",
     ],
@@ -96,6 +99,7 @@
         "android/hardware/gnss/1.1/GnssMeasurement.vts.h",
         "android/hardware/gnss/1.1/GnssMeasurementCallback.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/graphics/allocator/V2_0/build/Android.bp b/graphics/allocator/V2_0/build/Android.bp
index 15fd22f..5c6ef5e 100644
--- a/graphics/allocator/V2_0/build/Android.bp
+++ b/graphics/allocator/V2_0/build/Android.bp
@@ -17,25 +17,27 @@
 genrule {
     name: "android.hardware.graphics.allocator@2.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.allocator@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.allocator@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
     srcs: [
         ":android.hardware.graphics.allocator@2.0_hal",
     ],
     out: [
         "android/hardware/graphics/allocator/2.0/Allocator.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.graphics.allocator@2.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.allocator@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.allocator@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
     srcs: [
         ":android.hardware.graphics.allocator@2.0_hal",
     ],
     out: [
         "android/hardware/graphics/allocator/2.0/Allocator.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,25 +59,27 @@
 genrule {
     name: "android.hardware.graphics.allocator@2.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.allocator@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.allocator@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
     srcs: [
         ":android.hardware.graphics.allocator@2.0_hal",
     ],
     out: [
         "android/hardware/graphics/allocator/2.0/Allocator.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.graphics.allocator@2.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.allocator@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.allocator@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/allocator/2.0/ $(genDir)/android/hardware/graphics/allocator/2.0/",
     srcs: [
         ":android.hardware.graphics.allocator@2.0_hal",
     ],
     out: [
         "android/hardware/graphics/allocator/2.0/Allocator.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/graphics/bufferqueue/V1_0/build/Android.bp b/graphics/bufferqueue/V1_0/build/Android.bp
index 464dfa5..6686736 100644
--- a/graphics/bufferqueue/V1_0/build/Android.bp
+++ b/graphics/bufferqueue/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.graphics.bufferqueue@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.bufferqueue@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/bufferqueue/1.0/ $(genDir)/android/hardware/graphics/bufferqueue/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.bufferqueue@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/bufferqueue/1.0/ $(genDir)/android/hardware/graphics/bufferqueue/1.0/",
     srcs: [
         ":android.hardware.graphics.bufferqueue@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/graphics/bufferqueue/1.0/GraphicBufferProducer.vts.cpp",
         "android/hardware/graphics/bufferqueue/1.0/ProducerListener.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.graphics.bufferqueue@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.bufferqueue@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/bufferqueue/1.0/ $(genDir)/android/hardware/graphics/bufferqueue/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.bufferqueue@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/bufferqueue/1.0/ $(genDir)/android/hardware/graphics/bufferqueue/1.0/",
     srcs: [
         ":android.hardware.graphics.bufferqueue@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/graphics/bufferqueue/1.0/GraphicBufferProducer.vts.h",
         "android/hardware/graphics/bufferqueue/1.0/ProducerListener.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -62,7 +64,7 @@
 genrule {
     name: "android.hardware.graphics.bufferqueue@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.bufferqueue@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/bufferqueue/1.0/ $(genDir)/android/hardware/graphics/bufferqueue/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.bufferqueue@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/bufferqueue/1.0/ $(genDir)/android/hardware/graphics/bufferqueue/1.0/",
     srcs: [
         ":android.hardware.graphics.bufferqueue@1.0_hal",
     ],
@@ -70,12 +72,13 @@
         "android/hardware/graphics/bufferqueue/1.0/GraphicBufferProducer.vts.cpp",
         "android/hardware/graphics/bufferqueue/1.0/ProducerListener.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.graphics.bufferqueue@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.bufferqueue@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/bufferqueue/1.0/ $(genDir)/android/hardware/graphics/bufferqueue/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.bufferqueue@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/bufferqueue/1.0/ $(genDir)/android/hardware/graphics/bufferqueue/1.0/",
     srcs: [
         ":android.hardware.graphics.bufferqueue@1.0_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/graphics/bufferqueue/1.0/GraphicBufferProducer.vts.h",
         "android/hardware/graphics/bufferqueue/1.0/ProducerListener.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/graphics/common/V1_0/build/Android.bp b/graphics/common/V1_0/build/Android.bp
index a619348..ddc5b33 100644
--- a/graphics/common/V1_0/build/Android.bp
+++ b/graphics/common/V1_0/build/Android.bp
@@ -17,25 +17,27 @@
 genrule {
     name: "android.hardware.graphics.common@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.common@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/common/1.0/ $(genDir)/android/hardware/graphics/common/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.common@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/common/1.0/ $(genDir)/android/hardware/graphics/common/1.0/",
     srcs: [
         ":android.hardware.graphics.common@1.0_hal",
     ],
     out: [
         "android/hardware/graphics/common/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.graphics.common@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.common@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/common/1.0/ $(genDir)/android/hardware/graphics/common/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.common@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/common/1.0/ $(genDir)/android/hardware/graphics/common/1.0/",
     srcs: [
         ":android.hardware.graphics.common@1.0_hal",
     ],
     out: [
         "android/hardware/graphics/common/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -54,25 +56,27 @@
 genrule {
     name: "android.hardware.graphics.common@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.common@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/common/1.0/ $(genDir)/android/hardware/graphics/common/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.common@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/common/1.0/ $(genDir)/android/hardware/graphics/common/1.0/",
     srcs: [
         ":android.hardware.graphics.common@1.0_hal",
     ],
     out: [
         "android/hardware/graphics/common/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.graphics.common@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.common@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/common/1.0/ $(genDir)/android/hardware/graphics/common/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.common@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/common/1.0/ $(genDir)/android/hardware/graphics/common/1.0/",
     srcs: [
         ":android.hardware.graphics.common@1.0_hal",
     ],
     out: [
         "android/hardware/graphics/common/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/graphics/common/V1_1/build/Android.bp b/graphics/common/V1_1/build/Android.bp
index 3f6b984..4e029cc 100644
--- a/graphics/common/V1_1/build/Android.bp
+++ b/graphics/common/V1_1/build/Android.bp
@@ -17,25 +17,27 @@
 genrule {
     name: "android.hardware.graphics.common@1.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.common@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/common/1.1/ $(genDir)/android/hardware/graphics/common/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.common@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/common/1.1/ $(genDir)/android/hardware/graphics/common/1.1/",
     srcs: [
         ":android.hardware.graphics.common@1.1_hal",
     ],
     out: [
         "android/hardware/graphics/common/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.graphics.common@1.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.common@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/common/1.1/ $(genDir)/android/hardware/graphics/common/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.common@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/common/1.1/ $(genDir)/android/hardware/graphics/common/1.1/",
     srcs: [
         ":android.hardware.graphics.common@1.1_hal",
     ],
     out: [
         "android/hardware/graphics/common/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,25 +59,27 @@
 genrule {
     name: "android.hardware.graphics.common@1.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.common@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/common/1.1/ $(genDir)/android/hardware/graphics/common/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.common@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/common/1.1/ $(genDir)/android/hardware/graphics/common/1.1/",
     srcs: [
         ":android.hardware.graphics.common@1.1_hal",
     ],
     out: [
         "android/hardware/graphics/common/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.graphics.common@1.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.common@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/common/1.1/ $(genDir)/android/hardware/graphics/common/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.common@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/common/1.1/ $(genDir)/android/hardware/graphics/common/1.1/",
     srcs: [
         ":android.hardware.graphics.common@1.1_hal",
     ],
     out: [
         "android/hardware/graphics/common/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/graphics/composer/V2_1/build/Android.bp b/graphics/composer/V2_1/build/Android.bp
index efa3e2e..60e46b5 100644
--- a/graphics/composer/V2_1/build/Android.bp
+++ b/graphics/composer/V2_1/build/Android.bp
@@ -20,7 +20,7 @@
 genrule {
     name: "android.hardware.graphics.composer@2.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.composer@2.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/composer/2.1/ $(genDir)/android/hardware/graphics/composer/2.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.composer@2.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/composer/2.1/ $(genDir)/android/hardware/graphics/composer/2.1/",
     srcs: [
         ":android.hardware.graphics.composer@2.1_hal",
     ],
@@ -30,12 +30,13 @@
         "android/hardware/graphics/composer/2.1/ComposerClient.vts.cpp",
         "android/hardware/graphics/composer/2.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.graphics.composer@2.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.composer@2.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/composer/2.1/ $(genDir)/android/hardware/graphics/composer/2.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.composer@2.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/composer/2.1/ $(genDir)/android/hardware/graphics/composer/2.1/",
     srcs: [
         ":android.hardware.graphics.composer@2.1_hal",
     ],
@@ -45,6 +46,7 @@
         "android/hardware/graphics/composer/2.1/ComposerClient.vts.h",
         "android/hardware/graphics/composer/2.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -66,7 +68,7 @@
 genrule {
     name: "android.hardware.graphics.composer@2.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.composer@2.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/composer/2.1/ $(genDir)/android/hardware/graphics/composer/2.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.composer@2.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/composer/2.1/ $(genDir)/android/hardware/graphics/composer/2.1/",
     srcs: [
         ":android.hardware.graphics.composer@2.1_hal",
     ],
@@ -76,12 +78,13 @@
         "android/hardware/graphics/composer/2.1/ComposerClient.vts.cpp",
         "android/hardware/graphics/composer/2.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.graphics.composer@2.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.composer@2.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/composer/2.1/ $(genDir)/android/hardware/graphics/composer/2.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.composer@2.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/composer/2.1/ $(genDir)/android/hardware/graphics/composer/2.1/",
     srcs: [
         ":android.hardware.graphics.composer@2.1_hal",
     ],
@@ -91,6 +94,7 @@
         "android/hardware/graphics/composer/2.1/ComposerClient.vts.h",
         "android/hardware/graphics/composer/2.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/graphics/composer/V2_2/build/Android.bp b/graphics/composer/V2_2/build/Android.bp
index 57efbf3..a3cef71 100644
--- a/graphics/composer/V2_2/build/Android.bp
+++ b/graphics/composer/V2_2/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.graphics.composer@2.2-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.composer@2.2 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/composer/2.2/ $(genDir)/android/hardware/graphics/composer/2.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.composer@2.2 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/composer/2.2/ $(genDir)/android/hardware/graphics/composer/2.2/",
     srcs: [
         ":android.hardware.graphics.composer@2.2_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/graphics/composer/2.2/Composer.vts.cpp",
         "android/hardware/graphics/composer/2.2/ComposerClient.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.graphics.composer@2.2-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.composer@2.2 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/composer/2.2/ $(genDir)/android/hardware/graphics/composer/2.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.composer@2.2 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/composer/2.2/ $(genDir)/android/hardware/graphics/composer/2.2/",
     srcs: [
         ":android.hardware.graphics.composer@2.2_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/graphics/composer/2.2/Composer.vts.h",
         "android/hardware/graphics/composer/2.2/ComposerClient.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -64,7 +66,7 @@
 genrule {
     name: "android.hardware.graphics.composer@2.2-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.composer@2.2 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/composer/2.2/ $(genDir)/android/hardware/graphics/composer/2.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.composer@2.2 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/composer/2.2/ $(genDir)/android/hardware/graphics/composer/2.2/",
     srcs: [
         ":android.hardware.graphics.composer@2.2_hal",
     ],
@@ -72,12 +74,13 @@
         "android/hardware/graphics/composer/2.2/Composer.vts.cpp",
         "android/hardware/graphics/composer/2.2/ComposerClient.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.graphics.composer@2.2-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.composer@2.2 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/composer/2.2/ $(genDir)/android/hardware/graphics/composer/2.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.composer@2.2 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/composer/2.2/ $(genDir)/android/hardware/graphics/composer/2.2/",
     srcs: [
         ":android.hardware.graphics.composer@2.2_hal",
     ],
@@ -85,6 +88,7 @@
         "android/hardware/graphics/composer/2.2/Composer.vts.h",
         "android/hardware/graphics/composer/2.2/ComposerClient.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/graphics/mapper/V2_0/build/Android.bp b/graphics/mapper/V2_0/build/Android.bp
index 87254cd..5c57e84 100644
--- a/graphics/mapper/V2_0/build/Android.bp
+++ b/graphics/mapper/V2_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.graphics.mapper@2.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.mapper@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/mapper/2.0/ $(genDir)/android/hardware/graphics/mapper/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.mapper@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/mapper/2.0/ $(genDir)/android/hardware/graphics/mapper/2.0/",
     srcs: [
         ":android.hardware.graphics.mapper@2.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/graphics/mapper/2.0/Mapper.vts.cpp",
         "android/hardware/graphics/mapper/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.graphics.mapper@2.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.mapper@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/mapper/2.0/ $(genDir)/android/hardware/graphics/mapper/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.mapper@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/mapper/2.0/ $(genDir)/android/hardware/graphics/mapper/2.0/",
     srcs: [
         ":android.hardware.graphics.mapper@2.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/graphics/mapper/2.0/Mapper.vts.h",
         "android/hardware/graphics/mapper/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.graphics.mapper@2.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.mapper@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/mapper/2.0/ $(genDir)/android/hardware/graphics/mapper/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.mapper@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/mapper/2.0/ $(genDir)/android/hardware/graphics/mapper/2.0/",
     srcs: [
         ":android.hardware.graphics.mapper@2.0_hal",
     ],
@@ -68,12 +70,13 @@
         "android/hardware/graphics/mapper/2.0/Mapper.vts.cpp",
         "android/hardware/graphics/mapper/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.graphics.mapper@2.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.mapper@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/mapper/2.0/ $(genDir)/android/hardware/graphics/mapper/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.mapper@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/mapper/2.0/ $(genDir)/android/hardware/graphics/mapper/2.0/",
     srcs: [
         ":android.hardware.graphics.mapper@2.0_hal",
     ],
@@ -81,6 +84,7 @@
         "android/hardware/graphics/mapper/2.0/Mapper.vts.h",
         "android/hardware/graphics/mapper/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/graphics/mapper/V2_1/build/Android.bp b/graphics/mapper/V2_1/build/Android.bp
index 85b781f..137e8f1 100644
--- a/graphics/mapper/V2_1/build/Android.bp
+++ b/graphics/mapper/V2_1/build/Android.bp
@@ -17,25 +17,27 @@
 genrule {
     name: "android.hardware.graphics.mapper@2.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.mapper@2.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/mapper/2.1/ $(genDir)/android/hardware/graphics/mapper/2.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.mapper@2.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/mapper/2.1/ $(genDir)/android/hardware/graphics/mapper/2.1/",
     srcs: [
         ":android.hardware.graphics.mapper@2.1_hal",
     ],
     out: [
         "android/hardware/graphics/mapper/2.1/Mapper.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.graphics.mapper@2.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.mapper@2.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/mapper/2.1/ $(genDir)/android/hardware/graphics/mapper/2.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.mapper@2.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/mapper/2.1/ $(genDir)/android/hardware/graphics/mapper/2.1/",
     srcs: [
         ":android.hardware.graphics.mapper@2.1_hal",
     ],
     out: [
         "android/hardware/graphics/mapper/2.1/Mapper.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -61,25 +63,27 @@
 genrule {
     name: "android.hardware.graphics.mapper@2.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.mapper@2.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/mapper/2.1/ $(genDir)/android/hardware/graphics/mapper/2.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.mapper@2.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/graphics/mapper/2.1/ $(genDir)/android/hardware/graphics/mapper/2.1/",
     srcs: [
         ":android.hardware.graphics.mapper@2.1_hal",
     ],
     out: [
         "android/hardware/graphics/mapper/2.1/Mapper.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.graphics.mapper@2.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.mapper@2.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/mapper/2.1/ $(genDir)/android/hardware/graphics/mapper/2.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.graphics.mapper@2.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/graphics/mapper/2.1/ $(genDir)/android/hardware/graphics/mapper/2.1/",
     srcs: [
         ":android.hardware.graphics.mapper@2.1_hal",
     ],
     out: [
         "android/hardware/graphics/mapper/2.1/Mapper.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/health/V1_0/build/Android.bp b/health/V1_0/build/Android.bp
index ab8c0d5..720b39d 100644
--- a/health/V1_0/build/Android.bp
+++ b/health/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.health@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/health/1.0/ $(genDir)/android/hardware/health/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/health/1.0/ $(genDir)/android/hardware/health/1.0/",
     srcs: [
         ":android.hardware.health@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/health/1.0/Health.vts.cpp",
         "android/hardware/health/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.health@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/health/1.0/ $(genDir)/android/hardware/health/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/health/1.0/ $(genDir)/android/hardware/health/1.0/",
     srcs: [
         ":android.hardware.health@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/health/1.0/Health.vts.h",
         "android/hardware/health/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.health@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/health/1.0/ $(genDir)/android/hardware/health/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/health/1.0/ $(genDir)/android/hardware/health/1.0/",
     srcs: [
         ":android.hardware.health@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/health/1.0/Health.vts.cpp",
         "android/hardware/health/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.health@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/health/1.0/ $(genDir)/android/hardware/health/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/health/1.0/ $(genDir)/android/hardware/health/1.0/",
     srcs: [
         ":android.hardware.health@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/health/1.0/Health.vts.h",
         "android/hardware/health/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/health/V2_0/build/Android.bp b/health/V2_0/build/Android.bp
index 81b17f4..792e624 100644
--- a/health/V2_0/build/Android.bp
+++ b/health/V2_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.health@2.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/health/2.0/ $(genDir)/android/hardware/health/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/health/2.0/ $(genDir)/android/hardware/health/2.0/",
     srcs: [
         ":android.hardware.health@2.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/health/2.0/HealthInfoCallback.vts.cpp",
         "android/hardware/health/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.health@2.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/health/2.0/ $(genDir)/android/hardware/health/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/health/2.0/ $(genDir)/android/hardware/health/2.0/",
     srcs: [
         ":android.hardware.health@2.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/health/2.0/HealthInfoCallback.vts.h",
         "android/hardware/health/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -63,7 +65,7 @@
 genrule {
     name: "android.hardware.health@2.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/health/2.0/ $(genDir)/android/hardware/health/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/health/2.0/ $(genDir)/android/hardware/health/2.0/",
     srcs: [
         ":android.hardware.health@2.0_hal",
     ],
@@ -72,12 +74,13 @@
         "android/hardware/health/2.0/HealthInfoCallback.vts.cpp",
         "android/hardware/health/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.health@2.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/health/2.0/ $(genDir)/android/hardware/health/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/health/2.0/ $(genDir)/android/hardware/health/2.0/",
     srcs: [
         ":android.hardware.health@2.0_hal",
     ],
@@ -86,6 +89,7 @@
         "android/hardware/health/2.0/HealthInfoCallback.vts.h",
         "android/hardware/health/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/health/storage/V1_0/build/Android.bp b/health/storage/V1_0/build/Android.bp
index a4f2e04..bc38cde 100644
--- a/health/storage/V1_0/build/Android.bp
+++ b/health/storage/V1_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.health.storage@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health.storage@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/health/storage/1.0/ $(genDir)/android/hardware/health/storage/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health.storage@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/health/storage/1.0/ $(genDir)/android/hardware/health/storage/1.0/",
     srcs: [
         ":android.hardware.health.storage@1.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/health/storage/1.0/Storage.vts.cpp",
         "android/hardware/health/storage/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.health.storage@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health.storage@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/health/storage/1.0/ $(genDir)/android/hardware/health/storage/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health.storage@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/health/storage/1.0/ $(genDir)/android/hardware/health/storage/1.0/",
     srcs: [
         ":android.hardware.health.storage@1.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/health/storage/1.0/Storage.vts.h",
         "android/hardware/health/storage/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.health.storage@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health.storage@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/health/storage/1.0/ $(genDir)/android/hardware/health/storage/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health.storage@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/health/storage/1.0/ $(genDir)/android/hardware/health/storage/1.0/",
     srcs: [
         ":android.hardware.health.storage@1.0_hal",
     ],
@@ -69,12 +71,13 @@
         "android/hardware/health/storage/1.0/Storage.vts.cpp",
         "android/hardware/health/storage/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.health.storage@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health.storage@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/health/storage/1.0/ $(genDir)/android/hardware/health/storage/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.health.storage@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/health/storage/1.0/ $(genDir)/android/hardware/health/storage/1.0/",
     srcs: [
         ":android.hardware.health.storage@1.0_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/health/storage/1.0/Storage.vts.h",
         "android/hardware/health/storage/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/ir/V1_0/build/Android.bp b/ir/V1_0/build/Android.bp
index 4186225..aeebddb 100644
--- a/ir/V1_0/build/Android.bp
+++ b/ir/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.ir@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.ir@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/ir/1.0/ $(genDir)/android/hardware/ir/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.ir@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/ir/1.0/ $(genDir)/android/hardware/ir/1.0/",
     srcs: [
         ":android.hardware.ir@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/ir/1.0/ConsumerIr.vts.cpp",
         "android/hardware/ir/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.ir@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.ir@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/ir/1.0/ $(genDir)/android/hardware/ir/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.ir@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/ir/1.0/ $(genDir)/android/hardware/ir/1.0/",
     srcs: [
         ":android.hardware.ir@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/ir/1.0/ConsumerIr.vts.h",
         "android/hardware/ir/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.ir@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.ir@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/ir/1.0/ $(genDir)/android/hardware/ir/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.ir@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/ir/1.0/ $(genDir)/android/hardware/ir/1.0/",
     srcs: [
         ":android.hardware.ir@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/ir/1.0/ConsumerIr.vts.cpp",
         "android/hardware/ir/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.ir@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.ir@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/ir/1.0/ $(genDir)/android/hardware/ir/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.ir@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/ir/1.0/ $(genDir)/android/hardware/ir/1.0/",
     srcs: [
         ":android.hardware.ir@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/ir/1.0/ConsumerIr.vts.h",
         "android/hardware/ir/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/keymaster/V3_0/build/Android.bp b/keymaster/V3_0/build/Android.bp
index 13015d1..1131785 100644
--- a/keymaster/V3_0/build/Android.bp
+++ b/keymaster/V3_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.keymaster@3.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.keymaster@3.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/keymaster/3.0/ $(genDir)/android/hardware/keymaster/3.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.keymaster@3.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/keymaster/3.0/ $(genDir)/android/hardware/keymaster/3.0/",
     srcs: [
         ":android.hardware.keymaster@3.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/keymaster/3.0/KeymasterDevice.vts.cpp",
         "android/hardware/keymaster/3.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.keymaster@3.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.keymaster@3.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/keymaster/3.0/ $(genDir)/android/hardware/keymaster/3.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.keymaster@3.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/keymaster/3.0/ $(genDir)/android/hardware/keymaster/3.0/",
     srcs: [
         ":android.hardware.keymaster@3.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/keymaster/3.0/KeymasterDevice.vts.h",
         "android/hardware/keymaster/3.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.keymaster@3.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.keymaster@3.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/keymaster/3.0/ $(genDir)/android/hardware/keymaster/3.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.keymaster@3.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/keymaster/3.0/ $(genDir)/android/hardware/keymaster/3.0/",
     srcs: [
         ":android.hardware.keymaster@3.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/keymaster/3.0/KeymasterDevice.vts.cpp",
         "android/hardware/keymaster/3.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.keymaster@3.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.keymaster@3.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/keymaster/3.0/ $(genDir)/android/hardware/keymaster/3.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.keymaster@3.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/keymaster/3.0/ $(genDir)/android/hardware/keymaster/3.0/",
     srcs: [
         ":android.hardware.keymaster@3.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/keymaster/3.0/KeymasterDevice.vts.h",
         "android/hardware/keymaster/3.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/keymaster/V4_0/build/Android.bp b/keymaster/V4_0/build/Android.bp
index b5256f9..ef99ba2 100644
--- a/keymaster/V4_0/build/Android.bp
+++ b/keymaster/V4_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.keymaster@4.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.keymaster@4.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/keymaster/4.0/ $(genDir)/android/hardware/keymaster/4.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.keymaster@4.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/keymaster/4.0/ $(genDir)/android/hardware/keymaster/4.0/",
     srcs: [
         ":android.hardware.keymaster@4.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/keymaster/4.0/KeymasterDevice.vts.cpp",
         "android/hardware/keymaster/4.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.keymaster@4.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.keymaster@4.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/keymaster/4.0/ $(genDir)/android/hardware/keymaster/4.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.keymaster@4.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/keymaster/4.0/ $(genDir)/android/hardware/keymaster/4.0/",
     srcs: [
         ":android.hardware.keymaster@4.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/keymaster/4.0/KeymasterDevice.vts.h",
         "android/hardware/keymaster/4.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.keymaster@4.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.keymaster@4.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/keymaster/4.0/ $(genDir)/android/hardware/keymaster/4.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.keymaster@4.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/keymaster/4.0/ $(genDir)/android/hardware/keymaster/4.0/",
     srcs: [
         ":android.hardware.keymaster@4.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/keymaster/4.0/KeymasterDevice.vts.cpp",
         "android/hardware/keymaster/4.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.keymaster@4.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.keymaster@4.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/keymaster/4.0/ $(genDir)/android/hardware/keymaster/4.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.keymaster@4.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/keymaster/4.0/ $(genDir)/android/hardware/keymaster/4.0/",
     srcs: [
         ":android.hardware.keymaster@4.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/keymaster/4.0/KeymasterDevice.vts.h",
         "android/hardware/keymaster/4.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/light/V2_0/build/Android.bp b/light/V2_0/build/Android.bp
index 715d9bc..988e600 100644
--- a/light/V2_0/build/Android.bp
+++ b/light/V2_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.light@2.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.light@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/light/2.0/ $(genDir)/android/hardware/light/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.light@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/light/2.0/ $(genDir)/android/hardware/light/2.0/",
     srcs: [
         ":android.hardware.light@2.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/light/2.0/Light.vts.cpp",
         "android/hardware/light/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.light@2.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.light@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/light/2.0/ $(genDir)/android/hardware/light/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.light@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/light/2.0/ $(genDir)/android/hardware/light/2.0/",
     srcs: [
         ":android.hardware.light@2.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/light/2.0/Light.vts.h",
         "android/hardware/light/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.light@2.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.light@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/light/2.0/ $(genDir)/android/hardware/light/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.light@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/light/2.0/ $(genDir)/android/hardware/light/2.0/",
     srcs: [
         ":android.hardware.light@2.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/light/2.0/Light.vts.cpp",
         "android/hardware/light/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.light@2.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.light@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/light/2.0/ $(genDir)/android/hardware/light/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.light@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/light/2.0/ $(genDir)/android/hardware/light/2.0/",
     srcs: [
         ":android.hardware.light@2.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/light/2.0/Light.vts.h",
         "android/hardware/light/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/media/V1_0/build/Android.bp b/media/V1_0/build/Android.bp
index 4699b8c..ace5335 100644
--- a/media/V1_0/build/Android.bp
+++ b/media/V1_0/build/Android.bp
@@ -17,25 +17,27 @@
 genrule {
     name: "android.hardware.media@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/media/1.0/ $(genDir)/android/hardware/media/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/media/1.0/ $(genDir)/android/hardware/media/1.0/",
     srcs: [
         ":android.hardware.media@1.0_hal",
     ],
     out: [
         "android/hardware/media/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.media@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/media/1.0/ $(genDir)/android/hardware/media/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/media/1.0/ $(genDir)/android/hardware/media/1.0/",
     srcs: [
         ":android.hardware.media@1.0_hal",
     ],
     out: [
         "android/hardware/media/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,25 +59,27 @@
 genrule {
     name: "android.hardware.media@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/media/1.0/ $(genDir)/android/hardware/media/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/media/1.0/ $(genDir)/android/hardware/media/1.0/",
     srcs: [
         ":android.hardware.media@1.0_hal",
     ],
     out: [
         "android/hardware/media/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.media@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/media/1.0/ $(genDir)/android/hardware/media/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/media/1.0/ $(genDir)/android/hardware/media/1.0/",
     srcs: [
         ":android.hardware.media@1.0_hal",
     ],
     out: [
         "android/hardware/media/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/media/bufferpool/V1_0/build/Android.bp b/media/bufferpool/V1_0/build/Android.bp
index a585f2d..d2d7b8e 100644
--- a/media/bufferpool/V1_0/build/Android.bp
+++ b/media/bufferpool/V1_0/build/Android.bp
@@ -20,7 +20,7 @@
 genrule {
     name: "android.hardware.media.bufferpool@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media.bufferpool@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/media/bufferpool/1.0/ $(genDir)/android/hardware/media/bufferpool/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media.bufferpool@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/media/bufferpool/1.0/ $(genDir)/android/hardware/media/bufferpool/1.0/",
     srcs: [
         ":android.hardware.media.bufferpool@1.0_hal",
     ],
@@ -30,12 +30,13 @@
         "android/hardware/media/bufferpool/1.0/Connection.vts.cpp",
         "android/hardware/media/bufferpool/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.media.bufferpool@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media.bufferpool@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/media/bufferpool/1.0/ $(genDir)/android/hardware/media/bufferpool/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media.bufferpool@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/media/bufferpool/1.0/ $(genDir)/android/hardware/media/bufferpool/1.0/",
     srcs: [
         ":android.hardware.media.bufferpool@1.0_hal",
     ],
@@ -45,6 +46,7 @@
         "android/hardware/media/bufferpool/1.0/Connection.vts.h",
         "android/hardware/media/bufferpool/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -63,7 +65,7 @@
 genrule {
     name: "android.hardware.media.bufferpool@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media.bufferpool@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/media/bufferpool/1.0/ $(genDir)/android/hardware/media/bufferpool/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media.bufferpool@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/media/bufferpool/1.0/ $(genDir)/android/hardware/media/bufferpool/1.0/",
     srcs: [
         ":android.hardware.media.bufferpool@1.0_hal",
     ],
@@ -73,12 +75,13 @@
         "android/hardware/media/bufferpool/1.0/Connection.vts.cpp",
         "android/hardware/media/bufferpool/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.media.bufferpool@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media.bufferpool@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/media/bufferpool/1.0/ $(genDir)/android/hardware/media/bufferpool/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media.bufferpool@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/media/bufferpool/1.0/ $(genDir)/android/hardware/media/bufferpool/1.0/",
     srcs: [
         ":android.hardware.media.bufferpool@1.0_hal",
     ],
@@ -88,6 +91,7 @@
         "android/hardware/media/bufferpool/1.0/Connection.vts.h",
         "android/hardware/media/bufferpool/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/media/omx/V1_0/build/Android.bp b/media/omx/V1_0/build/Android.bp
index a58fff3..9c7096b 100644
--- a/media/omx/V1_0/build/Android.bp
+++ b/media/omx/V1_0/build/Android.bp
@@ -23,7 +23,7 @@
 genrule {
     name: "android.hardware.media.omx@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media.omx@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/media/omx/1.0/ $(genDir)/android/hardware/media/omx/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media.omx@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/media/omx/1.0/ $(genDir)/android/hardware/media/omx/1.0/",
     srcs: [
         ":android.hardware.media.omx@1.0_hal",
     ],
@@ -36,12 +36,13 @@
         "android/hardware/media/omx/1.0/OmxStore.vts.cpp",
         "android/hardware/media/omx/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.media.omx@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media.omx@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/media/omx/1.0/ $(genDir)/android/hardware/media/omx/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media.omx@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/media/omx/1.0/ $(genDir)/android/hardware/media/omx/1.0/",
     srcs: [
         ":android.hardware.media.omx@1.0_hal",
     ],
@@ -54,6 +55,7 @@
         "android/hardware/media/omx/1.0/OmxStore.vts.h",
         "android/hardware/media/omx/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -79,7 +81,7 @@
 genrule {
     name: "android.hardware.media.omx@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media.omx@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/media/omx/1.0/ $(genDir)/android/hardware/media/omx/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media.omx@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/media/omx/1.0/ $(genDir)/android/hardware/media/omx/1.0/",
     srcs: [
         ":android.hardware.media.omx@1.0_hal",
     ],
@@ -92,12 +94,13 @@
         "android/hardware/media/omx/1.0/OmxStore.vts.cpp",
         "android/hardware/media/omx/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.media.omx@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media.omx@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/media/omx/1.0/ $(genDir)/android/hardware/media/omx/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.media.omx@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/media/omx/1.0/ $(genDir)/android/hardware/media/omx/1.0/",
     srcs: [
         ":android.hardware.media.omx@1.0_hal",
     ],
@@ -110,6 +113,7 @@
         "android/hardware/media/omx/1.0/OmxStore.vts.h",
         "android/hardware/media/omx/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/memtrack/V1_0/build/Android.bp b/memtrack/V1_0/build/Android.bp
index bc7237a..c99a92f 100644
--- a/memtrack/V1_0/build/Android.bp
+++ b/memtrack/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.memtrack@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.memtrack@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/memtrack/1.0/ $(genDir)/android/hardware/memtrack/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.memtrack@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/memtrack/1.0/ $(genDir)/android/hardware/memtrack/1.0/",
     srcs: [
         ":android.hardware.memtrack@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/memtrack/1.0/Memtrack.vts.cpp",
         "android/hardware/memtrack/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.memtrack@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.memtrack@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/memtrack/1.0/ $(genDir)/android/hardware/memtrack/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.memtrack@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/memtrack/1.0/ $(genDir)/android/hardware/memtrack/1.0/",
     srcs: [
         ":android.hardware.memtrack@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/memtrack/1.0/Memtrack.vts.h",
         "android/hardware/memtrack/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.memtrack@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.memtrack@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/memtrack/1.0/ $(genDir)/android/hardware/memtrack/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.memtrack@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/memtrack/1.0/ $(genDir)/android/hardware/memtrack/1.0/",
     srcs: [
         ":android.hardware.memtrack@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/memtrack/1.0/Memtrack.vts.cpp",
         "android/hardware/memtrack/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.memtrack@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.memtrack@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/memtrack/1.0/ $(genDir)/android/hardware/memtrack/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.memtrack@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/memtrack/1.0/ $(genDir)/android/hardware/memtrack/1.0/",
     srcs: [
         ":android.hardware.memtrack@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/memtrack/1.0/Memtrack.vts.h",
         "android/hardware/memtrack/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/net/netd/V1_0/build/Android.bp b/net/netd/V1_0/build/Android.bp
deleted file mode 100644
index f0f52ac..0000000
--- a/net/netd/V1_0/build/Android.bp
+++ /dev/null
@@ -1,89 +0,0 @@
-// This file was auto-generated. Do not edit manually.
-// Use launch_hal_test.py or update_makefiles.py in test/vts-testcase/hal/script/ to generate this file.
-
-// Generate .vts spec files.
-hal2vts {
-    name: "android.system.net.netd@1.0-vts.spec",
-    hidl_gen_args: "-r android.system:system/hardware/interfaces",
-    srcs: [
-        ":android.system.net.netd@1.0_hal",
-    ],
-    out: [
-        "android/system/net/netd/1.0/Netd.vts",
-    ],
-}
-
-// Build VTS driver.
-genrule {
-    name: "android.system.net.netd@1.0-vts.driver_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.system:system/hardware/interfaces android.system.net.netd@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/system/net/netd/1.0/ $(genDir)/android/system/net/netd/1.0/",
-    srcs: [
-        ":android.system.net.netd@1.0_hal",
-    ],
-    out: [
-        "android/system/net/netd/1.0/Netd.vts.cpp",
-    ],
-}
-
-genrule {
-    name: "android.system.net.netd@1.0-vts.driver_genc++_headers",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.system:system/hardware/interfaces android.system.net.netd@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/system/net/netd/1.0/ $(genDir)/android/system/net/netd/1.0/",
-    srcs: [
-        ":android.system.net.netd@1.0_hal",
-    ],
-    out: [
-        "android/system/net/netd/1.0/Netd.vts.h",
-    ],
-}
-
-cc_library_shared {
-    name: "android.system.net.netd@1.0-vts.driver",
-    generated_sources: ["android.system.net.netd@1.0-vts.driver_genc++"],
-    generated_headers: ["android.system.net.netd@1.0-vts.driver_genc++_headers"],
-    export_generated_headers: ["android.system.net.netd@1.0-vts.driver_genc++_headers"],
-    defaults: ["VtsHalDriverDefaults"],
-    shared_libs: [],
-    static_libs: [
-        "android.system.net.netd@1.0",
-    ],
-}
-
-// Build VTS profiler.
-genrule {
-    name: "android.system.net.netd@1.0-vts.profiler_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.system:system/hardware/interfaces android.system.net.netd@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/system/net/netd/1.0/ $(genDir)/android/system/net/netd/1.0/",
-    srcs: [
-        ":android.system.net.netd@1.0_hal",
-    ],
-    out: [
-        "android/system/net/netd/1.0/Netd.vts.cpp",
-    ],
-}
-
-genrule {
-    name: "android.system.net.netd@1.0-vts.profiler_genc++_headers",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.system:system/hardware/interfaces android.system.net.netd@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/system/net/netd/1.0/ $(genDir)/android/system/net/netd/1.0/",
-    srcs: [
-        ":android.system.net.netd@1.0_hal",
-    ],
-    out: [
-        "android/system/net/netd/1.0/Netd.vts.h",
-    ],
-}
-
-cc_library_shared {
-    name: "android.system.net.netd@1.0-vts.profiler",
-    generated_sources: ["android.system.net.netd@1.0-vts.profiler_genc++"],
-    generated_headers: ["android.system.net.netd@1.0-vts.profiler_genc++_headers"],
-    export_generated_headers: ["android.system.net.netd@1.0-vts.profiler_genc++_headers"],
-    defaults: ["VtsHalProfilerDefaults"],
-    shared_libs: [],
-    static_libs: [
-        "android.system.net.netd@1.0",
-    ],
-}
-
diff --git a/net/netd/V1_1/build/Android.bp b/net/netd/V1_1/build/Android.bp
deleted file mode 100644
index 653af25..0000000
--- a/net/netd/V1_1/build/Android.bp
+++ /dev/null
@@ -1,95 +0,0 @@
-// This file was auto-generated. Do not edit manually.
-// Use launch_hal_test.py or update_makefiles.py in test/vts-testcase/hal/script/ to generate this file.
-
-// Generate .vts spec files.
-hal2vts {
-    name: "android.system.net.netd@1.1-vts.spec",
-    hidl_gen_args: "-r android.system:system/hardware/interfaces",
-    srcs: [
-        ":android.system.net.netd@1.1_hal",
-    ],
-    out: [
-        "android/system/net/netd/1.1/Netd.vts",
-    ],
-}
-
-// Build VTS driver.
-genrule {
-    name: "android.system.net.netd@1.1-vts.driver_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.system:system/hardware/interfaces android.system.net.netd@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/system/net/netd/1.1/ $(genDir)/android/system/net/netd/1.1/",
-    srcs: [
-        ":android.system.net.netd@1.1_hal",
-    ],
-    out: [
-        "android/system/net/netd/1.1/Netd.vts.cpp",
-    ],
-}
-
-genrule {
-    name: "android.system.net.netd@1.1-vts.driver_genc++_headers",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.system:system/hardware/interfaces android.system.net.netd@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/system/net/netd/1.1/ $(genDir)/android/system/net/netd/1.1/",
-    srcs: [
-        ":android.system.net.netd@1.1_hal",
-    ],
-    out: [
-        "android/system/net/netd/1.1/Netd.vts.h",
-    ],
-}
-
-cc_library_shared {
-    name: "android.system.net.netd@1.1-vts.driver",
-    generated_sources: ["android.system.net.netd@1.1-vts.driver_genc++"],
-    generated_headers: ["android.system.net.netd@1.1-vts.driver_genc++_headers"],
-    export_generated_headers: ["android.system.net.netd@1.1-vts.driver_genc++_headers"],
-    defaults: ["VtsHalDriverDefaults"],
-    shared_libs: [
-        "android.system.net.netd@1.0-vts.driver",
-    ],
-    static_libs: [
-        "android.system.net.netd@1.0",
-        "android.system.net.netd@1.1",
-    ],
-}
-
-// Build VTS profiler.
-genrule {
-    name: "android.system.net.netd@1.1-vts.profiler_genc++",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.system:system/hardware/interfaces android.system.net.netd@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/system/net/netd/1.1/ $(genDir)/android/system/net/netd/1.1/",
-    srcs: [
-        ":android.system.net.netd@1.1_hal",
-    ],
-    out: [
-        "android/system/net/netd/1.1/Netd.vts.cpp",
-    ],
-}
-
-genrule {
-    name: "android.system.net.netd@1.1-vts.profiler_genc++_headers",
-    tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.system:system/hardware/interfaces android.system.net.netd@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/system/net/netd/1.1/ $(genDir)/android/system/net/netd/1.1/",
-    srcs: [
-        ":android.system.net.netd@1.1_hal",
-    ],
-    out: [
-        "android/system/net/netd/1.1/Netd.vts.h",
-    ],
-}
-
-cc_library_shared {
-    name: "android.system.net.netd@1.1-vts.profiler",
-    generated_sources: ["android.system.net.netd@1.1-vts.profiler_genc++"],
-    generated_headers: ["android.system.net.netd@1.1-vts.profiler_genc++_headers"],
-    export_generated_headers: ["android.system.net.netd@1.1-vts.profiler_genc++_headers"],
-    defaults: ["VtsHalProfilerDefaults"],
-    shared_libs: [
-        "android.system.net.netd@1.0-vts.profiler",
-    ],
-    static_libs: [
-        "android.system.net.netd@1.0",
-        "android.system.net.netd@1.1",
-    ],
-}
-
diff --git a/neuralnetworks/OWNERS b/neuralnetworks/OWNERS
new file mode 100644
index 0000000..68cef7c
--- /dev/null
+++ b/neuralnetworks/OWNERS
@@ -0,0 +1,11 @@
+butlermichael@google.com
+dgross@google.com
+jeanluc@google.com
+levp@google.com
+miaowang@google.com
+mikie@google.com
+mks@google.com
+pszczepaniak@google.com
+slavash@google.com
+vddang@google.com
+xusongw@google.com
diff --git a/neuralnetworks/V1_0/build/Android.bp b/neuralnetworks/V1_0/build/Android.bp
index 799f72f..e75953f 100644
--- a/neuralnetworks/V1_0/build/Android.bp
+++ b/neuralnetworks/V1_0/build/Android.bp
@@ -21,7 +21,7 @@
 genrule {
     name: "android.hardware.neuralnetworks@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/neuralnetworks/1.0/ $(genDir)/android/hardware/neuralnetworks/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/neuralnetworks/1.0/ $(genDir)/android/hardware/neuralnetworks/1.0/",
     srcs: [
         ":android.hardware.neuralnetworks@1.0_hal",
     ],
@@ -32,12 +32,13 @@
         "android/hardware/neuralnetworks/1.0/PreparedModelCallback.vts.cpp",
         "android/hardware/neuralnetworks/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.neuralnetworks@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/neuralnetworks/1.0/ $(genDir)/android/hardware/neuralnetworks/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/neuralnetworks/1.0/ $(genDir)/android/hardware/neuralnetworks/1.0/",
     srcs: [
         ":android.hardware.neuralnetworks@1.0_hal",
     ],
@@ -48,6 +49,7 @@
         "android/hardware/neuralnetworks/1.0/PreparedModelCallback.vts.h",
         "android/hardware/neuralnetworks/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -66,7 +68,7 @@
 genrule {
     name: "android.hardware.neuralnetworks@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/neuralnetworks/1.0/ $(genDir)/android/hardware/neuralnetworks/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/neuralnetworks/1.0/ $(genDir)/android/hardware/neuralnetworks/1.0/",
     srcs: [
         ":android.hardware.neuralnetworks@1.0_hal",
     ],
@@ -77,12 +79,13 @@
         "android/hardware/neuralnetworks/1.0/PreparedModelCallback.vts.cpp",
         "android/hardware/neuralnetworks/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.neuralnetworks@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/neuralnetworks/1.0/ $(genDir)/android/hardware/neuralnetworks/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/neuralnetworks/1.0/ $(genDir)/android/hardware/neuralnetworks/1.0/",
     srcs: [
         ":android.hardware.neuralnetworks@1.0_hal",
     ],
@@ -93,6 +96,7 @@
         "android/hardware/neuralnetworks/1.0/PreparedModelCallback.vts.h",
         "android/hardware/neuralnetworks/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/neuralnetworks/V1_1/build/Android.bp b/neuralnetworks/V1_1/build/Android.bp
index 2a4aafd..4b3fbc2 100644
--- a/neuralnetworks/V1_1/build/Android.bp
+++ b/neuralnetworks/V1_1/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.neuralnetworks@1.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/neuralnetworks/1.1/ $(genDir)/android/hardware/neuralnetworks/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/neuralnetworks/1.1/ $(genDir)/android/hardware/neuralnetworks/1.1/",
     srcs: [
         ":android.hardware.neuralnetworks@1.1_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/neuralnetworks/1.1/Device.vts.cpp",
         "android/hardware/neuralnetworks/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.neuralnetworks@1.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/neuralnetworks/1.1/ $(genDir)/android/hardware/neuralnetworks/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/neuralnetworks/1.1/ $(genDir)/android/hardware/neuralnetworks/1.1/",
     srcs: [
         ":android.hardware.neuralnetworks@1.1_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/neuralnetworks/1.1/Device.vts.h",
         "android/hardware/neuralnetworks/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.neuralnetworks@1.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/neuralnetworks/1.1/ $(genDir)/android/hardware/neuralnetworks/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/neuralnetworks/1.1/ $(genDir)/android/hardware/neuralnetworks/1.1/",
     srcs: [
         ":android.hardware.neuralnetworks@1.1_hal",
     ],
@@ -68,12 +70,13 @@
         "android/hardware/neuralnetworks/1.1/Device.vts.cpp",
         "android/hardware/neuralnetworks/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.neuralnetworks@1.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/neuralnetworks/1.1/ $(genDir)/android/hardware/neuralnetworks/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/neuralnetworks/1.1/ $(genDir)/android/hardware/neuralnetworks/1.1/",
     srcs: [
         ":android.hardware.neuralnetworks@1.1_hal",
     ],
@@ -81,6 +84,7 @@
         "android/hardware/neuralnetworks/1.1/Device.vts.h",
         "android/hardware/neuralnetworks/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/neuralnetworks/V1_2/build/Android.bp b/neuralnetworks/V1_2/build/Android.bp
index 475d349..4e61692 100644
--- a/neuralnetworks/V1_2/build/Android.bp
+++ b/neuralnetworks/V1_2/build/Android.bp
@@ -9,6 +9,8 @@
         ":android.hardware.neuralnetworks@1.2_hal",
     ],
     out: [
+        "android/hardware/neuralnetworks/1.2/BurstCallback.vts",
+        "android/hardware/neuralnetworks/1.2/BurstContext.vts",
         "android/hardware/neuralnetworks/1.2/Device.vts",
         "android/hardware/neuralnetworks/1.2/ExecutionCallback.vts",
         "android/hardware/neuralnetworks/1.2/PreparedModel.vts",
@@ -21,33 +23,39 @@
 genrule {
     name: "android.hardware.neuralnetworks@1.2-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.2 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/neuralnetworks/1.2/ $(genDir)/android/hardware/neuralnetworks/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.2 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/neuralnetworks/1.2/ $(genDir)/android/hardware/neuralnetworks/1.2/",
     srcs: [
         ":android.hardware.neuralnetworks@1.2_hal",
     ],
     out: [
+        "android/hardware/neuralnetworks/1.2/BurstCallback.vts.cpp",
+        "android/hardware/neuralnetworks/1.2/BurstContext.vts.cpp",
         "android/hardware/neuralnetworks/1.2/Device.vts.cpp",
         "android/hardware/neuralnetworks/1.2/ExecutionCallback.vts.cpp",
         "android/hardware/neuralnetworks/1.2/PreparedModel.vts.cpp",
         "android/hardware/neuralnetworks/1.2/PreparedModelCallback.vts.cpp",
         "android/hardware/neuralnetworks/1.2/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.neuralnetworks@1.2-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.2 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/neuralnetworks/1.2/ $(genDir)/android/hardware/neuralnetworks/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.2 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/neuralnetworks/1.2/ $(genDir)/android/hardware/neuralnetworks/1.2/",
     srcs: [
         ":android.hardware.neuralnetworks@1.2_hal",
     ],
     out: [
+        "android/hardware/neuralnetworks/1.2/BurstCallback.vts.h",
+        "android/hardware/neuralnetworks/1.2/BurstContext.vts.h",
         "android/hardware/neuralnetworks/1.2/Device.vts.h",
         "android/hardware/neuralnetworks/1.2/ExecutionCallback.vts.h",
         "android/hardware/neuralnetworks/1.2/PreparedModel.vts.h",
         "android/hardware/neuralnetworks/1.2/PreparedModelCallback.vts.h",
         "android/hardware/neuralnetworks/1.2/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -59,11 +67,13 @@
     shared_libs: [
         "android.hardware.neuralnetworks@1.0-vts.driver",
         "android.hardware.neuralnetworks@1.1-vts.driver",
+        "android.hidl.safe_union@1.0-vts.driver",
     ],
     static_libs: [
         "android.hardware.neuralnetworks@1.0",
         "android.hardware.neuralnetworks@1.1",
         "android.hardware.neuralnetworks@1.2",
+        "android.hidl.safe_union@1.0",
     ],
 }
 
@@ -71,33 +81,39 @@
 genrule {
     name: "android.hardware.neuralnetworks@1.2-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.2 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/neuralnetworks/1.2/ $(genDir)/android/hardware/neuralnetworks/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.2 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/neuralnetworks/1.2/ $(genDir)/android/hardware/neuralnetworks/1.2/",
     srcs: [
         ":android.hardware.neuralnetworks@1.2_hal",
     ],
     out: [
+        "android/hardware/neuralnetworks/1.2/BurstCallback.vts.cpp",
+        "android/hardware/neuralnetworks/1.2/BurstContext.vts.cpp",
         "android/hardware/neuralnetworks/1.2/Device.vts.cpp",
         "android/hardware/neuralnetworks/1.2/ExecutionCallback.vts.cpp",
         "android/hardware/neuralnetworks/1.2/PreparedModel.vts.cpp",
         "android/hardware/neuralnetworks/1.2/PreparedModelCallback.vts.cpp",
         "android/hardware/neuralnetworks/1.2/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.neuralnetworks@1.2-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.2 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/neuralnetworks/1.2/ $(genDir)/android/hardware/neuralnetworks/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.neuralnetworks@1.2 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/neuralnetworks/1.2/ $(genDir)/android/hardware/neuralnetworks/1.2/",
     srcs: [
         ":android.hardware.neuralnetworks@1.2_hal",
     ],
     out: [
+        "android/hardware/neuralnetworks/1.2/BurstCallback.vts.h",
+        "android/hardware/neuralnetworks/1.2/BurstContext.vts.h",
         "android/hardware/neuralnetworks/1.2/Device.vts.h",
         "android/hardware/neuralnetworks/1.2/ExecutionCallback.vts.h",
         "android/hardware/neuralnetworks/1.2/PreparedModel.vts.h",
         "android/hardware/neuralnetworks/1.2/PreparedModelCallback.vts.h",
         "android/hardware/neuralnetworks/1.2/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -109,11 +125,13 @@
     shared_libs: [
         "android.hardware.neuralnetworks@1.0-vts.profiler",
         "android.hardware.neuralnetworks@1.1-vts.profiler",
+        "android.hidl.safe_union@1.0-vts.profiler",
     ],
     static_libs: [
         "android.hardware.neuralnetworks@1.0",
         "android.hardware.neuralnetworks@1.1",
         "android.hardware.neuralnetworks@1.2",
+        "android.hidl.safe_union@1.0",
     ],
 }
 
diff --git a/nfc/V1_0/build/Android.bp b/nfc/V1_0/build/Android.bp
index ac0a952..0e0deb2 100644
--- a/nfc/V1_0/build/Android.bp
+++ b/nfc/V1_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.nfc@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.nfc@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.nfc@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/",
     srcs: [
         ":android.hardware.nfc@1.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/nfc/1.0/NfcClientCallback.vts.cpp",
         "android/hardware/nfc/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.nfc@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.nfc@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.nfc@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/",
     srcs: [
         ":android.hardware.nfc@1.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/nfc/1.0/NfcClientCallback.vts.h",
         "android/hardware/nfc/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.nfc@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.nfc@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.nfc@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/",
     srcs: [
         ":android.hardware.nfc@1.0_hal",
     ],
@@ -69,12 +71,13 @@
         "android/hardware/nfc/1.0/NfcClientCallback.vts.cpp",
         "android/hardware/nfc/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.nfc@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.nfc@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.nfc@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/nfc/1.0/ $(genDir)/android/hardware/nfc/1.0/",
     srcs: [
         ":android.hardware.nfc@1.0_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/nfc/1.0/NfcClientCallback.vts.h",
         "android/hardware/nfc/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/nfc/V1_1/build/Android.bp b/nfc/V1_1/build/Android.bp
index 0c14d22..84d314f 100644
--- a/nfc/V1_1/build/Android.bp
+++ b/nfc/V1_1/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.nfc@1.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.nfc@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/nfc/1.1/ $(genDir)/android/hardware/nfc/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.nfc@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/nfc/1.1/ $(genDir)/android/hardware/nfc/1.1/",
     srcs: [
         ":android.hardware.nfc@1.1_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/nfc/1.1/NfcClientCallback.vts.cpp",
         "android/hardware/nfc/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.nfc@1.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.nfc@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/nfc/1.1/ $(genDir)/android/hardware/nfc/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.nfc@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/nfc/1.1/ $(genDir)/android/hardware/nfc/1.1/",
     srcs: [
         ":android.hardware.nfc@1.1_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/nfc/1.1/NfcClientCallback.vts.h",
         "android/hardware/nfc/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -63,7 +65,7 @@
 genrule {
     name: "android.hardware.nfc@1.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.nfc@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/nfc/1.1/ $(genDir)/android/hardware/nfc/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.nfc@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/nfc/1.1/ $(genDir)/android/hardware/nfc/1.1/",
     srcs: [
         ":android.hardware.nfc@1.1_hal",
     ],
@@ -72,12 +74,13 @@
         "android/hardware/nfc/1.1/NfcClientCallback.vts.cpp",
         "android/hardware/nfc/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.nfc@1.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.nfc@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/nfc/1.1/ $(genDir)/android/hardware/nfc/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.nfc@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/nfc/1.1/ $(genDir)/android/hardware/nfc/1.1/",
     srcs: [
         ":android.hardware.nfc@1.1_hal",
     ],
@@ -86,6 +89,7 @@
         "android/hardware/nfc/1.1/NfcClientCallback.vts.h",
         "android/hardware/nfc/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/oemlock/V1_0/build/Android.bp b/oemlock/V1_0/build/Android.bp
index 0b7a346..41d593a 100644
--- a/oemlock/V1_0/build/Android.bp
+++ b/oemlock/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.oemlock@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.oemlock@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/oemlock/1.0/ $(genDir)/android/hardware/oemlock/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.oemlock@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/oemlock/1.0/ $(genDir)/android/hardware/oemlock/1.0/",
     srcs: [
         ":android.hardware.oemlock@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/oemlock/1.0/OemLock.vts.cpp",
         "android/hardware/oemlock/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.oemlock@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.oemlock@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/oemlock/1.0/ $(genDir)/android/hardware/oemlock/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.oemlock@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/oemlock/1.0/ $(genDir)/android/hardware/oemlock/1.0/",
     srcs: [
         ":android.hardware.oemlock@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/oemlock/1.0/OemLock.vts.h",
         "android/hardware/oemlock/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.oemlock@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.oemlock@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/oemlock/1.0/ $(genDir)/android/hardware/oemlock/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.oemlock@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/oemlock/1.0/ $(genDir)/android/hardware/oemlock/1.0/",
     srcs: [
         ":android.hardware.oemlock@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/oemlock/1.0/OemLock.vts.cpp",
         "android/hardware/oemlock/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.oemlock@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.oemlock@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/oemlock/1.0/ $(genDir)/android/hardware/oemlock/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.oemlock@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/oemlock/1.0/ $(genDir)/android/hardware/oemlock/1.0/",
     srcs: [
         ":android.hardware.oemlock@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/oemlock/1.0/OemLock.vts.h",
         "android/hardware/oemlock/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/power/V1_0/build/Android.bp b/power/V1_0/build/Android.bp
index 500860d..754fcfb 100644
--- a/power/V1_0/build/Android.bp
+++ b/power/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.power@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/power/1.0/ $(genDir)/android/hardware/power/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/power/1.0/ $(genDir)/android/hardware/power/1.0/",
     srcs: [
         ":android.hardware.power@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/power/1.0/Power.vts.cpp",
         "android/hardware/power/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.power@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/power/1.0/ $(genDir)/android/hardware/power/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/power/1.0/ $(genDir)/android/hardware/power/1.0/",
     srcs: [
         ":android.hardware.power@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/power/1.0/Power.vts.h",
         "android/hardware/power/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.power@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/power/1.0/ $(genDir)/android/hardware/power/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/power/1.0/ $(genDir)/android/hardware/power/1.0/",
     srcs: [
         ":android.hardware.power@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/power/1.0/Power.vts.cpp",
         "android/hardware/power/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.power@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/power/1.0/ $(genDir)/android/hardware/power/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/power/1.0/ $(genDir)/android/hardware/power/1.0/",
     srcs: [
         ":android.hardware.power@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/power/1.0/Power.vts.h",
         "android/hardware/power/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/power/V1_1/build/Android.bp b/power/V1_1/build/Android.bp
index 2236803..2b1b0f6 100644
--- a/power/V1_1/build/Android.bp
+++ b/power/V1_1/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.power@1.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/power/1.1/ $(genDir)/android/hardware/power/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/power/1.1/ $(genDir)/android/hardware/power/1.1/",
     srcs: [
         ":android.hardware.power@1.1_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/power/1.1/Power.vts.cpp",
         "android/hardware/power/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.power@1.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/power/1.1/ $(genDir)/android/hardware/power/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/power/1.1/ $(genDir)/android/hardware/power/1.1/",
     srcs: [
         ":android.hardware.power@1.1_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/power/1.1/Power.vts.h",
         "android/hardware/power/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.power@1.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/power/1.1/ $(genDir)/android/hardware/power/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/power/1.1/ $(genDir)/android/hardware/power/1.1/",
     srcs: [
         ":android.hardware.power@1.1_hal",
     ],
@@ -68,12 +70,13 @@
         "android/hardware/power/1.1/Power.vts.cpp",
         "android/hardware/power/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.power@1.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/power/1.1/ $(genDir)/android/hardware/power/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/power/1.1/ $(genDir)/android/hardware/power/1.1/",
     srcs: [
         ":android.hardware.power@1.1_hal",
     ],
@@ -81,6 +84,7 @@
         "android/hardware/power/1.1/Power.vts.h",
         "android/hardware/power/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/power/V1_2/build/Android.bp b/power/V1_2/build/Android.bp
index 52ef995..40cd7d8 100644
--- a/power/V1_2/build/Android.bp
+++ b/power/V1_2/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.power@1.2-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.2 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/power/1.2/ $(genDir)/android/hardware/power/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.2 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/power/1.2/ $(genDir)/android/hardware/power/1.2/",
     srcs: [
         ":android.hardware.power@1.2_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/power/1.2/Power.vts.cpp",
         "android/hardware/power/1.2/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.power@1.2-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.2 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/power/1.2/ $(genDir)/android/hardware/power/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.2 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/power/1.2/ $(genDir)/android/hardware/power/1.2/",
     srcs: [
         ":android.hardware.power@1.2_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/power/1.2/Power.vts.h",
         "android/hardware/power/1.2/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -62,7 +64,7 @@
 genrule {
     name: "android.hardware.power@1.2-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.2 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/power/1.2/ $(genDir)/android/hardware/power/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.2 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/power/1.2/ $(genDir)/android/hardware/power/1.2/",
     srcs: [
         ":android.hardware.power@1.2_hal",
     ],
@@ -70,12 +72,13 @@
         "android/hardware/power/1.2/Power.vts.cpp",
         "android/hardware/power/1.2/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.power@1.2-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.2 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/power/1.2/ $(genDir)/android/hardware/power/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.2 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/power/1.2/ $(genDir)/android/hardware/power/1.2/",
     srcs: [
         ":android.hardware.power@1.2_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/power/1.2/Power.vts.h",
         "android/hardware/power/1.2/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/power/V1_3/build/Android.bp b/power/V1_3/build/Android.bp
index 7c7b27f..3a9f19f 100644
--- a/power/V1_3/build/Android.bp
+++ b/power/V1_3/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.power@1.3-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.3 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/power/1.3/ $(genDir)/android/hardware/power/1.3/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.3 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/power/1.3/ $(genDir)/android/hardware/power/1.3/",
     srcs: [
         ":android.hardware.power@1.3_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/power/1.3/Power.vts.cpp",
         "android/hardware/power/1.3/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.power@1.3-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.3 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/power/1.3/ $(genDir)/android/hardware/power/1.3/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.3 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/power/1.3/ $(genDir)/android/hardware/power/1.3/",
     srcs: [
         ":android.hardware.power@1.3_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/power/1.3/Power.vts.h",
         "android/hardware/power/1.3/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -64,7 +66,7 @@
 genrule {
     name: "android.hardware.power@1.3-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.3 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/power/1.3/ $(genDir)/android/hardware/power/1.3/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.3 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/power/1.3/ $(genDir)/android/hardware/power/1.3/",
     srcs: [
         ":android.hardware.power@1.3_hal",
     ],
@@ -72,12 +74,13 @@
         "android/hardware/power/1.3/Power.vts.cpp",
         "android/hardware/power/1.3/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.power@1.3-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.3 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/power/1.3/ $(genDir)/android/hardware/power/1.3/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.power@1.3 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/power/1.3/ $(genDir)/android/hardware/power/1.3/",
     srcs: [
         ":android.hardware.power@1.3_hal",
     ],
@@ -85,6 +88,7 @@
         "android/hardware/power/1.3/Power.vts.h",
         "android/hardware/power/1.3/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/radio/V1_0/build/Android.bp b/radio/V1_0/build/Android.bp
index 360c610..713b253 100644
--- a/radio/V1_0/build/Android.bp
+++ b/radio/V1_0/build/Android.bp
@@ -22,7 +22,7 @@
 genrule {
     name: "android.hardware.radio@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
     srcs: [
         ":android.hardware.radio@1.0_hal",
     ],
@@ -34,12 +34,13 @@
         "android/hardware/radio/1.0/SapCallback.vts.cpp",
         "android/hardware/radio/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.radio@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
     srcs: [
         ":android.hardware.radio@1.0_hal",
     ],
@@ -51,6 +52,7 @@
         "android/hardware/radio/1.0/SapCallback.vts.h",
         "android/hardware/radio/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -69,7 +71,7 @@
 genrule {
     name: "android.hardware.radio@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
     srcs: [
         ":android.hardware.radio@1.0_hal",
     ],
@@ -81,12 +83,13 @@
         "android/hardware/radio/1.0/SapCallback.vts.cpp",
         "android/hardware/radio/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.radio@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/1.0/ $(genDir)/android/hardware/radio/1.0/",
     srcs: [
         ":android.hardware.radio@1.0_hal",
     ],
@@ -98,6 +101,7 @@
         "android/hardware/radio/1.0/SapCallback.vts.h",
         "android/hardware/radio/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/radio/V1_1/adapter/Android.mk b/radio/V1_1/adapter/Android.mk
deleted file mode 100644
index 52e4a0e..0000000
--- a/radio/V1_1/adapter/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VtsHalRadioV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/radio/V1_1/adapter
-include test/vts/tools/build/Android.host_config.mk
diff --git a/gnss/V1_1/adapter/Android.mk b/radio/V1_1/adapter/CtsDevicePolicyManagerTestCases/Android.mk
similarity index 88%
rename from gnss/V1_1/adapter/Android.mk
rename to radio/V1_1/adapter/CtsDevicePolicyManagerTestCases/Android.mk
index abfb48d..041476d 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/radio/V1_1/adapter/CtsDevicePolicyManagerTestCases/Android.mk
@@ -18,6 +18,5 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalRadioV1_1AdapterCtsDevicePolicyManagerTestCases
 include test/vts/tools/build/Android.host_config.mk
diff --git a/radio/V1_1/adapter/AndroidTest.xml b/radio/V1_1/adapter/CtsDevicePolicyManagerTestCases/AndroidTest.xml
similarity index 92%
copy from radio/V1_1/adapter/AndroidTest.xml
copy to radio/V1_1/adapter/CtsDevicePolicyManagerTestCases/AndroidTest.xml
index 1e1d782..b1e9fd9 100644
--- a/radio/V1_1/adapter/AndroidTest.xml
+++ b/radio/V1_1/adapter/CtsDevicePolicyManagerTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Config for VTS VtsHalRadioV1_1Adapter test cases">
+<configuration description="Config for VTS VtsHalRadioV1_1AdapterCtsDevicePolicyManagerTestCases test cases">
     <option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
     <object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
         <option name="hal-package-name" value="android.hardware.radio@1.1"/>
@@ -27,6 +27,4 @@
         <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
     </test>
     <include name="CtsDevicePolicyManagerTestCases.config"/>
-    <include name="CtsJobSchedulerTestCases.config"/>
-    <include name="CtsTelephonyTestCases.config"/>
 </configuration>
diff --git a/gnss/V1_1/adapter/Android.mk b/radio/V1_1/adapter/CtsJobSchedulerTestCases/Android.mk
similarity index 88%
copy from gnss/V1_1/adapter/Android.mk
copy to radio/V1_1/adapter/CtsJobSchedulerTestCases/Android.mk
index abfb48d..208c0c3 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/radio/V1_1/adapter/CtsJobSchedulerTestCases/Android.mk
@@ -18,6 +18,5 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalRadioV1_1AdapterCtsJobSchedulerTestCases
 include test/vts/tools/build/Android.host_config.mk
diff --git a/radio/V1_1/adapter/AndroidTest.xml b/radio/V1_1/adapter/CtsJobSchedulerTestCases/AndroidTest.xml
similarity index 92%
rename from radio/V1_1/adapter/AndroidTest.xml
rename to radio/V1_1/adapter/CtsJobSchedulerTestCases/AndroidTest.xml
index 1e1d782..7570289 100644
--- a/radio/V1_1/adapter/AndroidTest.xml
+++ b/radio/V1_1/adapter/CtsJobSchedulerTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Config for VTS VtsHalRadioV1_1Adapter test cases">
+<configuration description="Config for VTS VtsHalRadioV1_1AdapterCtsJobSchedulerTestCases test cases">
     <option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
     <object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
         <option name="hal-package-name" value="android.hardware.radio@1.1"/>
@@ -26,7 +26,5 @@
         <option name="package" value="com.android.devicehealth.tests"/>
         <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
     </test>
-    <include name="CtsDevicePolicyManagerTestCases.config"/>
     <include name="CtsJobSchedulerTestCases.config"/>
-    <include name="CtsTelephonyTestCases.config"/>
 </configuration>
diff --git a/gnss/V1_1/adapter/Android.mk b/radio/V1_1/adapter/CtsTelephonyTestCases/Android.mk
similarity index 88%
copy from gnss/V1_1/adapter/Android.mk
copy to radio/V1_1/adapter/CtsTelephonyTestCases/Android.mk
index abfb48d..805f949 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/radio/V1_1/adapter/CtsTelephonyTestCases/Android.mk
@@ -18,6 +18,5 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalRadioV1_1AdapterCtsTelephonyTestCases
 include test/vts/tools/build/Android.host_config.mk
diff --git a/radio/V1_1/adapter/AndroidTest.xml b/radio/V1_1/adapter/CtsTelephonyTestCases/AndroidTest.xml
similarity index 92%
copy from radio/V1_1/adapter/AndroidTest.xml
copy to radio/V1_1/adapter/CtsTelephonyTestCases/AndroidTest.xml
index 1e1d782..541b692 100644
--- a/radio/V1_1/adapter/AndroidTest.xml
+++ b/radio/V1_1/adapter/CtsTelephonyTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Config for VTS VtsHalRadioV1_1Adapter test cases">
+<configuration description="Config for VTS VtsHalRadioV1_1AdapterCtsTelephonyTestCases test cases">
     <option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
     <object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
         <option name="hal-package-name" value="android.hardware.radio@1.1"/>
@@ -26,7 +26,5 @@
         <option name="package" value="com.android.devicehealth.tests"/>
         <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
     </test>
-    <include name="CtsDevicePolicyManagerTestCases.config"/>
-    <include name="CtsJobSchedulerTestCases.config"/>
     <include name="CtsTelephonyTestCases.config"/>
 </configuration>
diff --git a/radio/V1_1/build/Android.bp b/radio/V1_1/build/Android.bp
index 9783e46..118fa44 100644
--- a/radio/V1_1/build/Android.bp
+++ b/radio/V1_1/build/Android.bp
@@ -21,7 +21,7 @@
 genrule {
     name: "android.hardware.radio@1.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/radio/1.1/ $(genDir)/android/hardware/radio/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/radio/1.1/ $(genDir)/android/hardware/radio/1.1/",
     srcs: [
         ":android.hardware.radio@1.1_hal",
     ],
@@ -32,12 +32,13 @@
         "android/hardware/radio/1.1/Sap.vts.cpp",
         "android/hardware/radio/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.radio@1.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/radio/1.1/ $(genDir)/android/hardware/radio/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/radio/1.1/ $(genDir)/android/hardware/radio/1.1/",
     srcs: [
         ":android.hardware.radio@1.1_hal",
     ],
@@ -48,6 +49,7 @@
         "android/hardware/radio/1.1/Sap.vts.h",
         "android/hardware/radio/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -69,7 +71,7 @@
 genrule {
     name: "android.hardware.radio@1.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/1.1/ $(genDir)/android/hardware/radio/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/1.1/ $(genDir)/android/hardware/radio/1.1/",
     srcs: [
         ":android.hardware.radio@1.1_hal",
     ],
@@ -80,12 +82,13 @@
         "android/hardware/radio/1.1/Sap.vts.cpp",
         "android/hardware/radio/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.radio@1.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/1.1/ $(genDir)/android/hardware/radio/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/1.1/ $(genDir)/android/hardware/radio/1.1/",
     srcs: [
         ":android.hardware.radio@1.1_hal",
     ],
@@ -96,6 +99,7 @@
         "android/hardware/radio/1.1/Sap.vts.h",
         "android/hardware/radio/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/radio/V1_2/build/Android.bp b/radio/V1_2/build/Android.bp
index 2654c1e..a814543 100644
--- a/radio/V1_2/build/Android.bp
+++ b/radio/V1_2/build/Android.bp
@@ -21,7 +21,7 @@
 genrule {
     name: "android.hardware.radio@1.2-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.2 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/radio/1.2/ $(genDir)/android/hardware/radio/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.2 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/radio/1.2/ $(genDir)/android/hardware/radio/1.2/",
     srcs: [
         ":android.hardware.radio@1.2_hal",
     ],
@@ -32,12 +32,13 @@
         "android/hardware/radio/1.2/Sap.vts.cpp",
         "android/hardware/radio/1.2/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.radio@1.2-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.2 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/radio/1.2/ $(genDir)/android/hardware/radio/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.2 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/radio/1.2/ $(genDir)/android/hardware/radio/1.2/",
     srcs: [
         ":android.hardware.radio@1.2_hal",
     ],
@@ -48,6 +49,7 @@
         "android/hardware/radio/1.2/Sap.vts.h",
         "android/hardware/radio/1.2/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -71,7 +73,7 @@
 genrule {
     name: "android.hardware.radio@1.2-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.2 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/1.2/ $(genDir)/android/hardware/radio/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.2 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/1.2/ $(genDir)/android/hardware/radio/1.2/",
     srcs: [
         ":android.hardware.radio@1.2_hal",
     ],
@@ -82,12 +84,13 @@
         "android/hardware/radio/1.2/Sap.vts.cpp",
         "android/hardware/radio/1.2/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.radio@1.2-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.2 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/1.2/ $(genDir)/android/hardware/radio/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.2 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/1.2/ $(genDir)/android/hardware/radio/1.2/",
     srcs: [
         ":android.hardware.radio@1.2_hal",
     ],
@@ -98,6 +101,7 @@
         "android/hardware/radio/1.2/Sap.vts.h",
         "android/hardware/radio/1.2/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/radio/V1_2/target/radio/AndroidTest.xml b/radio/V1_2/target/radio/AndroidTest.xml
index fc815fb..6e6cea4 100644
--- a/radio/V1_2/target/radio/AndroidTest.xml
+++ b/radio/V1_2/target/radio/AndroidTest.xml
@@ -32,7 +32,7 @@
         <option name="binary-test-stop-native-servers" value="true"/>
         <option name="test-timeout" value="15m"/>
         <!-- b/64734869: a known incompatibility with new tests (waiver) -->
-        <option name="exclude-filter" value="VtsHalRadioV1_2Target#RadioHidlTest_v1_2.startNetworkScan_GoodRequest1" />
-        <option name="exclude-filter" value="VtsHalRadioV1_2Target#RadioHidlTest_v1_2.startNetworkScan_GoodRequest2" />
+        <option name="exclude-filter" value="RadioHidlTest_v1_2.startNetworkScan_GoodRequest1" />
+        <option name="exclude-filter" value="RadioHidlTest_v1_2.startNetworkScan_GoodRequest2" />
     </test>
 </configuration>
diff --git a/radio/V1_3/build/Android.bp b/radio/V1_3/build/Android.bp
index 9023b6f..38ab531 100644
--- a/radio/V1_3/build/Android.bp
+++ b/radio/V1_3/build/Android.bp
@@ -12,6 +12,7 @@
         "android/hardware/radio/1.3/Radio.vts",
         "android/hardware/radio/1.3/RadioIndication.vts",
         "android/hardware/radio/1.3/RadioResponse.vts",
+        "android/hardware/radio/1.3/types.vts",
     ],
 }
 
@@ -19,7 +20,7 @@
 genrule {
     name: "android.hardware.radio@1.3-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.3 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/radio/1.3/ $(genDir)/android/hardware/radio/1.3/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.3 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/radio/1.3/ $(genDir)/android/hardware/radio/1.3/",
     srcs: [
         ":android.hardware.radio@1.3_hal",
     ],
@@ -27,13 +28,15 @@
         "android/hardware/radio/1.3/Radio.vts.cpp",
         "android/hardware/radio/1.3/RadioIndication.vts.cpp",
         "android/hardware/radio/1.3/RadioResponse.vts.cpp",
+        "android/hardware/radio/1.3/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.radio@1.3-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.3 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/radio/1.3/ $(genDir)/android/hardware/radio/1.3/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.3 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/radio/1.3/ $(genDir)/android/hardware/radio/1.3/",
     srcs: [
         ":android.hardware.radio@1.3_hal",
     ],
@@ -41,7 +44,9 @@
         "android/hardware/radio/1.3/Radio.vts.h",
         "android/hardware/radio/1.3/RadioIndication.vts.h",
         "android/hardware/radio/1.3/RadioResponse.vts.h",
+        "android/hardware/radio/1.3/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -67,7 +72,7 @@
 genrule {
     name: "android.hardware.radio@1.3-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.3 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/1.3/ $(genDir)/android/hardware/radio/1.3/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.3 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/1.3/ $(genDir)/android/hardware/radio/1.3/",
     srcs: [
         ":android.hardware.radio@1.3_hal",
     ],
@@ -75,13 +80,15 @@
         "android/hardware/radio/1.3/Radio.vts.cpp",
         "android/hardware/radio/1.3/RadioIndication.vts.cpp",
         "android/hardware/radio/1.3/RadioResponse.vts.cpp",
+        "android/hardware/radio/1.3/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.radio@1.3-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.3 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/1.3/ $(genDir)/android/hardware/radio/1.3/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.3 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/1.3/ $(genDir)/android/hardware/radio/1.3/",
     srcs: [
         ":android.hardware.radio@1.3_hal",
     ],
@@ -89,7 +96,9 @@
         "android/hardware/radio/1.3/Radio.vts.h",
         "android/hardware/radio/1.3/RadioIndication.vts.h",
         "android/hardware/radio/1.3/RadioResponse.vts.h",
+        "android/hardware/radio/1.3/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/radio/V1_4/build/Android.bp b/radio/V1_4/build/Android.bp
index ddfeb4b..5a5b591 100644
--- a/radio/V1_4/build/Android.bp
+++ b/radio/V1_4/build/Android.bp
@@ -20,7 +20,7 @@
 genrule {
     name: "android.hardware.radio@1.4-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.4 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/radio/1.4/ $(genDir)/android/hardware/radio/1.4/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.4 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/radio/1.4/ $(genDir)/android/hardware/radio/1.4/",
     srcs: [
         ":android.hardware.radio@1.4_hal",
     ],
@@ -30,12 +30,13 @@
         "android/hardware/radio/1.4/RadioResponse.vts.cpp",
         "android/hardware/radio/1.4/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.radio@1.4-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.4 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/radio/1.4/ $(genDir)/android/hardware/radio/1.4/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.4 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/radio/1.4/ $(genDir)/android/hardware/radio/1.4/",
     srcs: [
         ":android.hardware.radio@1.4_hal",
     ],
@@ -45,6 +46,7 @@
         "android/hardware/radio/1.4/RadioResponse.vts.h",
         "android/hardware/radio/1.4/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -74,7 +76,7 @@
 genrule {
     name: "android.hardware.radio@1.4-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.4 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/1.4/ $(genDir)/android/hardware/radio/1.4/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.4 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/1.4/ $(genDir)/android/hardware/radio/1.4/",
     srcs: [
         ":android.hardware.radio@1.4_hal",
     ],
@@ -84,12 +86,13 @@
         "android/hardware/radio/1.4/RadioResponse.vts.cpp",
         "android/hardware/radio/1.4/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.radio@1.4-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.4 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/1.4/ $(genDir)/android/hardware/radio/1.4/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.4 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/1.4/ $(genDir)/android/hardware/radio/1.4/",
     srcs: [
         ":android.hardware.radio@1.4_hal",
     ],
@@ -99,6 +102,7 @@
         "android/hardware/radio/1.4/RadioResponse.vts.h",
         "android/hardware/radio/1.4/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/radio/config/V1_0/build/Android.bp b/radio/config/V1_0/build/Android.bp
index 44aab85..f7d7247 100644
--- a/radio/config/V1_0/build/Android.bp
+++ b/radio/config/V1_0/build/Android.bp
@@ -20,7 +20,7 @@
 genrule {
     name: "android.hardware.radio.config@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio.config@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/radio/config/1.0/ $(genDir)/android/hardware/radio/config/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio.config@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/radio/config/1.0/ $(genDir)/android/hardware/radio/config/1.0/",
     srcs: [
         ":android.hardware.radio.config@1.0_hal",
     ],
@@ -30,12 +30,13 @@
         "android/hardware/radio/config/1.0/RadioConfigResponse.vts.cpp",
         "android/hardware/radio/config/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.radio.config@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio.config@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/radio/config/1.0/ $(genDir)/android/hardware/radio/config/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio.config@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/radio/config/1.0/ $(genDir)/android/hardware/radio/config/1.0/",
     srcs: [
         ":android.hardware.radio.config@1.0_hal",
     ],
@@ -45,6 +46,7 @@
         "android/hardware/radio/config/1.0/RadioConfigResponse.vts.h",
         "android/hardware/radio/config/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -66,7 +68,7 @@
 genrule {
     name: "android.hardware.radio.config@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio.config@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/config/1.0/ $(genDir)/android/hardware/radio/config/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio.config@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/config/1.0/ $(genDir)/android/hardware/radio/config/1.0/",
     srcs: [
         ":android.hardware.radio.config@1.0_hal",
     ],
@@ -76,12 +78,13 @@
         "android/hardware/radio/config/1.0/RadioConfigResponse.vts.cpp",
         "android/hardware/radio/config/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.radio.config@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio.config@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/config/1.0/ $(genDir)/android/hardware/radio/config/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio.config@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/config/1.0/ $(genDir)/android/hardware/radio/config/1.0/",
     srcs: [
         ":android.hardware.radio.config@1.0_hal",
     ],
@@ -91,6 +94,7 @@
         "android/hardware/radio/config/1.0/RadioConfigResponse.vts.h",
         "android/hardware/radio/config/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/radio/deprecated/V1_0/build/Android.bp b/radio/deprecated/V1_0/build/Android.bp
index f7bb3f6..da8887c 100644
--- a/radio/deprecated/V1_0/build/Android.bp
+++ b/radio/deprecated/V1_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.radio.deprecated@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio.deprecated@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/radio/deprecated/1.0/ $(genDir)/android/hardware/radio/deprecated/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio.deprecated@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/radio/deprecated/1.0/ $(genDir)/android/hardware/radio/deprecated/1.0/",
     srcs: [
         ":android.hardware.radio.deprecated@1.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/radio/deprecated/1.0/OemHookIndication.vts.cpp",
         "android/hardware/radio/deprecated/1.0/OemHookResponse.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.radio.deprecated@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio.deprecated@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/radio/deprecated/1.0/ $(genDir)/android/hardware/radio/deprecated/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio.deprecated@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/radio/deprecated/1.0/ $(genDir)/android/hardware/radio/deprecated/1.0/",
     srcs: [
         ":android.hardware.radio.deprecated@1.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/radio/deprecated/1.0/OemHookIndication.vts.h",
         "android/hardware/radio/deprecated/1.0/OemHookResponse.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -63,7 +65,7 @@
 genrule {
     name: "android.hardware.radio.deprecated@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio.deprecated@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/deprecated/1.0/ $(genDir)/android/hardware/radio/deprecated/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio.deprecated@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/deprecated/1.0/ $(genDir)/android/hardware/radio/deprecated/1.0/",
     srcs: [
         ":android.hardware.radio.deprecated@1.0_hal",
     ],
@@ -72,12 +74,13 @@
         "android/hardware/radio/deprecated/1.0/OemHookIndication.vts.cpp",
         "android/hardware/radio/deprecated/1.0/OemHookResponse.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.radio.deprecated@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio.deprecated@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/deprecated/1.0/ $(genDir)/android/hardware/radio/deprecated/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio.deprecated@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/deprecated/1.0/ $(genDir)/android/hardware/radio/deprecated/1.0/",
     srcs: [
         ":android.hardware.radio.deprecated@1.0_hal",
     ],
@@ -86,6 +89,7 @@
         "android/hardware/radio/deprecated/1.0/OemHookIndication.vts.h",
         "android/hardware/radio/deprecated/1.0/OemHookResponse.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/renderscript/V1_0/build/Android.bp b/renderscript/V1_0/build/Android.bp
index b9cd635..0e61715 100644
--- a/renderscript/V1_0/build/Android.bp
+++ b/renderscript/V1_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.renderscript@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.renderscript@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.renderscript@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
     srcs: [
         ":android.hardware.renderscript@1.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/renderscript/1.0/Device.vts.cpp",
         "android/hardware/renderscript/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.renderscript@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.renderscript@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.renderscript@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
     srcs: [
         ":android.hardware.renderscript@1.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/renderscript/1.0/Device.vts.h",
         "android/hardware/renderscript/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.renderscript@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.renderscript@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.renderscript@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
     srcs: [
         ":android.hardware.renderscript@1.0_hal",
     ],
@@ -69,12 +71,13 @@
         "android/hardware/renderscript/1.0/Device.vts.cpp",
         "android/hardware/renderscript/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.renderscript@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.renderscript@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.renderscript@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
     srcs: [
         ":android.hardware.renderscript@1.0_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/renderscript/1.0/Device.vts.h",
         "android/hardware/renderscript/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/script/build/template/vts_build_template.bp b/script/build/template/vts_build_template.bp
index 9993dae..0f8e438 100644
--- a/script/build/template/vts_build_template.bp
+++ b/script/build/template/vts_build_template.bp
@@ -12,21 +12,23 @@
 genrule {
     name: "{PACKAGE_ROOT}.{HAL_NAME}@{HAL_VERSION}-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts {HIDL_GEN_ARGS} {PACKAGE_ROOT}.{HAL_NAME}@{HAL_VERSION} && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) {PACKAGE_ROOT_DIR}/{HAL_NAME_DIR}/{HAL_VERSION}/ $(genDir)/{PACKAGE_ROOT_DIR}/{HAL_NAME_DIR}/{HAL_VERSION}/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts {HIDL_GEN_ARGS} {PACKAGE_ROOT}.{HAL_NAME}@{HAL_VERSION} && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) {PACKAGE_ROOT_DIR}/{HAL_NAME_DIR}/{HAL_VERSION}/ $(genDir)/{PACKAGE_ROOT_DIR}/{HAL_NAME_DIR}/{HAL_VERSION}/",
     srcs: [
         ":{PACKAGE_ROOT}.{HAL_NAME}@{HAL_VERSION}_hal",
     ],
     out: [{GENERATED_SOURCES}],
+    depfile: true,
 }
 
 genrule {
     name: "{PACKAGE_ROOT}.{HAL_NAME}@{HAL_VERSION}-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts {HIDL_GEN_ARGS} {PACKAGE_ROOT}.{HAL_NAME}@{HAL_VERSION} && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) {PACKAGE_ROOT_DIR}/{HAL_NAME_DIR}/{HAL_VERSION}/ $(genDir)/{PACKAGE_ROOT_DIR}/{HAL_NAME_DIR}/{HAL_VERSION}/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts {HIDL_GEN_ARGS} {PACKAGE_ROOT}.{HAL_NAME}@{HAL_VERSION} && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) {PACKAGE_ROOT_DIR}/{HAL_NAME_DIR}/{HAL_VERSION}/ $(genDir)/{PACKAGE_ROOT_DIR}/{HAL_NAME_DIR}/{HAL_VERSION}/",
     srcs: [
         ":{PACKAGE_ROOT}.{HAL_NAME}@{HAL_VERSION}_hal",
     ],
     out: [{GENERATED_HEADERS}],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -43,21 +45,23 @@
 genrule {
     name: "{PACKAGE_ROOT}.{HAL_NAME}@{HAL_VERSION}-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts {HIDL_GEN_ARGS} {PACKAGE_ROOT}.{HAL_NAME}@{HAL_VERSION} && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) {PACKAGE_ROOT_DIR}/{HAL_NAME_DIR}/{HAL_VERSION}/ $(genDir)/{PACKAGE_ROOT_DIR}/{HAL_NAME_DIR}/{HAL_VERSION}/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts {HIDL_GEN_ARGS} {PACKAGE_ROOT}.{HAL_NAME}@{HAL_VERSION} && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) {PACKAGE_ROOT_DIR}/{HAL_NAME_DIR}/{HAL_VERSION}/ $(genDir)/{PACKAGE_ROOT_DIR}/{HAL_NAME_DIR}/{HAL_VERSION}/",
     srcs: [
         ":{PACKAGE_ROOT}.{HAL_NAME}@{HAL_VERSION}_hal",
     ],
     out: [{GENERATED_SOURCES}],
+    depfile: true,
 }
 
 genrule {
     name: "{PACKAGE_ROOT}.{HAL_NAME}@{HAL_VERSION}-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts {HIDL_GEN_ARGS} {PACKAGE_ROOT}.{HAL_NAME}@{HAL_VERSION} && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) {PACKAGE_ROOT_DIR}/{HAL_NAME_DIR}/{HAL_VERSION}/ $(genDir)/{PACKAGE_ROOT_DIR}/{HAL_NAME_DIR}/{HAL_VERSION}/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts {HIDL_GEN_ARGS} {PACKAGE_ROOT}.{HAL_NAME}@{HAL_VERSION} && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) {PACKAGE_ROOT_DIR}/{HAL_NAME_DIR}/{HAL_VERSION}/ $(genDir)/{PACKAGE_ROOT_DIR}/{HAL_NAME_DIR}/{HAL_VERSION}/",
     srcs: [
         ":{PACKAGE_ROOT}.{HAL_NAME}@{HAL_VERSION}_hal",
     ],
     out: [{GENERATED_HEADERS}],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/script/update_makefiles.py b/script/update_makefiles.py
index c905a24..34d900d 100755
--- a/script/update_makefiles.py
+++ b/script/update_makefiles.py
@@ -27,13 +27,38 @@
      cd test/vts-testcase/hal; ./script/update_makefiles.py --hal nfc@1.0
 """
 import argparse
+import os
 import re
 import sys
 
 from build.build_rule_gen import BuildRuleGen
 from utils.const import Constant
 
-if __name__ == "__main__":
+# File used to make sure users follow the provided update manual.
+_LOCK_FILE_NAME = "repo_upload_lock"
+
+def Touch(file_path):
+    """Touches a given file whose path is 'file_path'."""
+    open(file_path, "a").close()
+
+
+def Usage(updated_files):
+    """Shows the update manual and exits."""
+    print "Please do the following before re-trying repo upload ."
+    print "$ cd $ANDROID_BUILD_TOP/test/vts-testcase/hal"
+    print "$ rm", _LOCK_FILE_NAME
+    if updated_files:
+        for updated_file in updated_files:
+            print "$ git add %s" % updated_file
+    else:
+        print "$ git add <deleted file>"
+    print "$ git commit"
+    print "$ repo upload"
+    sys.exit(-1)
+
+
+def Main():
+    """Main function."""
     parser = argparse.ArgumentParser(
         description='Update build files for HAL driver/profiler.')
     parser.add_argument(
@@ -62,12 +87,14 @@
         updated_files, updated = build_rule_gen.UpdateBuildRule(
             Constant.VTS_HAL_TEST_CASE_PATH)
     if updated:
+        Touch(_LOCK_FILE_NAME)
         print "ERROR: At least one file was not up-to-date and is updated now."
-        print "Please do the following before redoing repo upload ."
-        print "$ cd $ANDROID_BUILD_TOP/test/vts-testcase/hal"
-        for updated_file in updated_files:
-            print "$ git add %s" % updated_file
-        print "$ git commit"
-        print "$ repo upload"
+        Usage(updated_files)
+    elif os.path.exists(_LOCK_FILE_NAME):
+        print "ERROR: The previously updated file(s) are not sent as a change."
+        print "The files are under $ANDROID_BUILD_TOP/test/vts-testcase/hal"
         sys.exit(-1)
 
+
+if __name__ == "__main__":
+    Main()
diff --git a/secure_element/V1_0/build/Android.bp b/secure_element/V1_0/build/Android.bp
index b8fa697..57150b6 100644
--- a/secure_element/V1_0/build/Android.bp
+++ b/secure_element/V1_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.secure_element@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.secure_element@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/secure_element/1.0/ $(genDir)/android/hardware/secure_element/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.secure_element@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/secure_element/1.0/ $(genDir)/android/hardware/secure_element/1.0/",
     srcs: [
         ":android.hardware.secure_element@1.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/secure_element/1.0/SecureElementHalCallback.vts.cpp",
         "android/hardware/secure_element/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.secure_element@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.secure_element@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/secure_element/1.0/ $(genDir)/android/hardware/secure_element/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.secure_element@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/secure_element/1.0/ $(genDir)/android/hardware/secure_element/1.0/",
     srcs: [
         ":android.hardware.secure_element@1.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/secure_element/1.0/SecureElementHalCallback.vts.h",
         "android/hardware/secure_element/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.secure_element@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.secure_element@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/secure_element/1.0/ $(genDir)/android/hardware/secure_element/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.secure_element@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/secure_element/1.0/ $(genDir)/android/hardware/secure_element/1.0/",
     srcs: [
         ":android.hardware.secure_element@1.0_hal",
     ],
@@ -69,12 +71,13 @@
         "android/hardware/secure_element/1.0/SecureElementHalCallback.vts.cpp",
         "android/hardware/secure_element/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.secure_element@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.secure_element@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/secure_element/1.0/ $(genDir)/android/hardware/secure_element/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.secure_element@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/secure_element/1.0/ $(genDir)/android/hardware/secure_element/1.0/",
     srcs: [
         ":android.hardware.secure_element@1.0_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/secure_element/1.0/SecureElementHalCallback.vts.h",
         "android/hardware/secure_element/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/sensors/V1_0/build/Android.bp b/sensors/V1_0/build/Android.bp
index 17d4e79..cf83534 100644
--- a/sensors/V1_0/build/Android.bp
+++ b/sensors/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.sensors@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.sensors@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/sensors/1.0/ $(genDir)/android/hardware/sensors/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.sensors@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/sensors/1.0/ $(genDir)/android/hardware/sensors/1.0/",
     srcs: [
         ":android.hardware.sensors@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/sensors/1.0/Sensors.vts.cpp",
         "android/hardware/sensors/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.sensors@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.sensors@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/sensors/1.0/ $(genDir)/android/hardware/sensors/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.sensors@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/sensors/1.0/ $(genDir)/android/hardware/sensors/1.0/",
     srcs: [
         ":android.hardware.sensors@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/sensors/1.0/Sensors.vts.h",
         "android/hardware/sensors/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.sensors@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.sensors@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/sensors/1.0/ $(genDir)/android/hardware/sensors/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.sensors@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/sensors/1.0/ $(genDir)/android/hardware/sensors/1.0/",
     srcs: [
         ":android.hardware.sensors@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/sensors/1.0/Sensors.vts.cpp",
         "android/hardware/sensors/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.sensors@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.sensors@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/sensors/1.0/ $(genDir)/android/hardware/sensors/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.sensors@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/sensors/1.0/ $(genDir)/android/hardware/sensors/1.0/",
     srcs: [
         ":android.hardware.sensors@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/sensors/1.0/Sensors.vts.h",
         "android/hardware/sensors/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/soundtrigger/V2_0/build/Android.bp b/soundtrigger/V2_0/build/Android.bp
index 797b63a..e7ad0dc 100644
--- a/soundtrigger/V2_0/build/Android.bp
+++ b/soundtrigger/V2_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.soundtrigger@2.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.soundtrigger@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/soundtrigger/2.0/ $(genDir)/android/hardware/soundtrigger/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.soundtrigger@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/soundtrigger/2.0/ $(genDir)/android/hardware/soundtrigger/2.0/",
     srcs: [
         ":android.hardware.soundtrigger@2.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/soundtrigger/2.0/SoundTriggerHwCallback.vts.cpp",
         "android/hardware/soundtrigger/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.soundtrigger@2.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.soundtrigger@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/soundtrigger/2.0/ $(genDir)/android/hardware/soundtrigger/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.soundtrigger@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/soundtrigger/2.0/ $(genDir)/android/hardware/soundtrigger/2.0/",
     srcs: [
         ":android.hardware.soundtrigger@2.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/soundtrigger/2.0/SoundTriggerHwCallback.vts.h",
         "android/hardware/soundtrigger/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -63,7 +65,7 @@
 genrule {
     name: "android.hardware.soundtrigger@2.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.soundtrigger@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/soundtrigger/2.0/ $(genDir)/android/hardware/soundtrigger/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.soundtrigger@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/soundtrigger/2.0/ $(genDir)/android/hardware/soundtrigger/2.0/",
     srcs: [
         ":android.hardware.soundtrigger@2.0_hal",
     ],
@@ -72,12 +74,13 @@
         "android/hardware/soundtrigger/2.0/SoundTriggerHwCallback.vts.cpp",
         "android/hardware/soundtrigger/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.soundtrigger@2.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.soundtrigger@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/soundtrigger/2.0/ $(genDir)/android/hardware/soundtrigger/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.soundtrigger@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/soundtrigger/2.0/ $(genDir)/android/hardware/soundtrigger/2.0/",
     srcs: [
         ":android.hardware.soundtrigger@2.0_hal",
     ],
@@ -86,6 +89,7 @@
         "android/hardware/soundtrigger/2.0/SoundTriggerHwCallback.vts.h",
         "android/hardware/soundtrigger/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/soundtrigger/V2_1/adapter/Android.mk b/soundtrigger/V2_1/adapter/Android.mk
deleted file mode 100644
index cf1fbc7..0000000
--- a/soundtrigger/V2_1/adapter/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VtsHalSoundtriggerV2_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/soundtrigger/V2_1/adapter
-include test/vts/tools/build/Android.host_config.mk
diff --git a/gnss/V1_1/adapter/Android.mk b/soundtrigger/V2_1/adapter/CtsStatsdHostTestCases/Android.mk
similarity index 88%
copy from gnss/V1_1/adapter/Android.mk
copy to soundtrigger/V2_1/adapter/CtsStatsdHostTestCases/Android.mk
index abfb48d..dbdae0c 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/soundtrigger/V2_1/adapter/CtsStatsdHostTestCases/Android.mk
@@ -18,6 +18,5 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalSoundtriggerV2_1AdapterCtsStatsdHostTestCases
 include test/vts/tools/build/Android.host_config.mk
diff --git a/soundtrigger/V2_1/adapter/AndroidTest.xml b/soundtrigger/V2_1/adapter/CtsStatsdHostTestCases/AndroidTest.xml
similarity index 95%
copy from soundtrigger/V2_1/adapter/AndroidTest.xml
copy to soundtrigger/V2_1/adapter/CtsStatsdHostTestCases/AndroidTest.xml
index e292e96..fbc7de3 100644
--- a/soundtrigger/V2_1/adapter/AndroidTest.xml
+++ b/soundtrigger/V2_1/adapter/CtsStatsdHostTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Config for VTS VtsHalSoundtriggerV2_1Adapter test cases">
+<configuration description="Config for VTS VtsHalSoundtriggerV2_1AdapterCtsStatsdHostTestCases test cases">
     <option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
     <object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
         <option name="hal-package-name" value="android.hardware.soundtrigger@2.1"/>
@@ -27,5 +27,4 @@
         <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
     </test>
     <include name="CtsStatsdHostTestCases.config"/>
-    <include name="CtsWidgetTestCases.config"/>
 </configuration>
diff --git a/gnss/V1_1/adapter/Android.mk b/soundtrigger/V2_1/adapter/CtsWidgetTestCases/Android.mk
similarity index 88%
copy from gnss/V1_1/adapter/Android.mk
copy to soundtrigger/V2_1/adapter/CtsWidgetTestCases/Android.mk
index abfb48d..5abee3f 100644
--- a/gnss/V1_1/adapter/Android.mk
+++ b/soundtrigger/V2_1/adapter/CtsWidgetTestCases/Android.mk
@@ -18,6 +18,5 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := VtsHalGnssV1_1Adapter
-VTS_CONFIG_SRC_DIR := testcases/hal/gnss/V1_1/adapter
+LOCAL_MODULE := VtsHalSoundtriggerV2_1AdapterCtsWidgetTestCases
 include test/vts/tools/build/Android.host_config.mk
diff --git a/soundtrigger/V2_1/adapter/AndroidTest.xml b/soundtrigger/V2_1/adapter/CtsWidgetTestCases/AndroidTest.xml
similarity index 95%
rename from soundtrigger/V2_1/adapter/AndroidTest.xml
rename to soundtrigger/V2_1/adapter/CtsWidgetTestCases/AndroidTest.xml
index e292e96..fef5747 100644
--- a/soundtrigger/V2_1/adapter/AndroidTest.xml
+++ b/soundtrigger/V2_1/adapter/CtsWidgetTestCases/AndroidTest.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Config for VTS VtsHalSoundtriggerV2_1Adapter test cases">
+<configuration description="Config for VTS VtsHalSoundtriggerV2_1AdapterCtsWidgetTestCases test cases">
     <option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
     <object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
         <option name="hal-package-name" value="android.hardware.soundtrigger@2.1"/>
@@ -26,6 +26,5 @@
         <option name="package" value="com.android.devicehealth.tests"/>
         <option name="runner" value="android.support.test.runner.AndroidJUnitRunner"/>
     </test>
-    <include name="CtsStatsdHostTestCases.config"/>
     <include name="CtsWidgetTestCases.config"/>
 </configuration>
diff --git a/soundtrigger/V2_1/build/Android.bp b/soundtrigger/V2_1/build/Android.bp
index 10cbca9..4798f24 100644
--- a/soundtrigger/V2_1/build/Android.bp
+++ b/soundtrigger/V2_1/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.soundtrigger@2.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.soundtrigger@2.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/soundtrigger/2.1/ $(genDir)/android/hardware/soundtrigger/2.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.soundtrigger@2.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/soundtrigger/2.1/ $(genDir)/android/hardware/soundtrigger/2.1/",
     srcs: [
         ":android.hardware.soundtrigger@2.1_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/soundtrigger/2.1/SoundTriggerHw.vts.cpp",
         "android/hardware/soundtrigger/2.1/SoundTriggerHwCallback.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.soundtrigger@2.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.soundtrigger@2.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/soundtrigger/2.1/ $(genDir)/android/hardware/soundtrigger/2.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.soundtrigger@2.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/soundtrigger/2.1/ $(genDir)/android/hardware/soundtrigger/2.1/",
     srcs: [
         ":android.hardware.soundtrigger@2.1_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/soundtrigger/2.1/SoundTriggerHw.vts.h",
         "android/hardware/soundtrigger/2.1/SoundTriggerHwCallback.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -62,7 +64,7 @@
 genrule {
     name: "android.hardware.soundtrigger@2.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.soundtrigger@2.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/soundtrigger/2.1/ $(genDir)/android/hardware/soundtrigger/2.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.soundtrigger@2.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/soundtrigger/2.1/ $(genDir)/android/hardware/soundtrigger/2.1/",
     srcs: [
         ":android.hardware.soundtrigger@2.1_hal",
     ],
@@ -70,12 +72,13 @@
         "android/hardware/soundtrigger/2.1/SoundTriggerHw.vts.cpp",
         "android/hardware/soundtrigger/2.1/SoundTriggerHwCallback.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.soundtrigger@2.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.soundtrigger@2.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/soundtrigger/2.1/ $(genDir)/android/hardware/soundtrigger/2.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.soundtrigger@2.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/soundtrigger/2.1/ $(genDir)/android/hardware/soundtrigger/2.1/",
     srcs: [
         ":android.hardware.soundtrigger@2.1_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/soundtrigger/2.1/SoundTriggerHw.vts.h",
         "android/hardware/soundtrigger/2.1/SoundTriggerHwCallback.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/system/hidl/safe_union/V1_0/build/Android.bp b/system/hidl/safe_union/V1_0/build/Android.bp
index 2df9de8..1ccfef2 100644
--- a/system/hidl/safe_union/V1_0/build/Android.bp
+++ b/system/hidl/safe_union/V1_0/build/Android.bp
@@ -1,6 +1,3 @@
-// This file was auto-generated. Do not edit manually.
-// Use launch_hal_test.py or update_makefiles.py in test/vts-testcase/hal/script/ to generate this file.
-
 // Generate .vts spec files.
 hal2vts {
     name: "android.hidl.safe_union@1.0-vts.spec",
diff --git a/tests/bar/V1_0/build/Android.bp b/tests/bar/V1_0/build/Android.bp
index f7cee53..e6406cf 100644
--- a/tests/bar/V1_0/build/Android.bp
+++ b/tests/bar/V1_0/build/Android.bp
@@ -22,7 +22,7 @@
 genrule {
     name: "android.hardware.tests.bar@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.bar@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/bar/1.0/ $(genDir)/android/hardware/tests/bar/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.bar@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/bar/1.0/ $(genDir)/android/hardware/tests/bar/1.0/",
     srcs: [
         ":android.hardware.tests.bar@1.0_hal",
     ],
@@ -34,12 +34,13 @@
         "android/hardware/tests/bar/1.0/ImportTypes.vts.cpp",
         "android/hardware/tests/bar/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.bar@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.bar@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/bar/1.0/ $(genDir)/android/hardware/tests/bar/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.bar@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/bar/1.0/ $(genDir)/android/hardware/tests/bar/1.0/",
     srcs: [
         ":android.hardware.tests.bar@1.0_hal",
     ],
@@ -51,6 +52,7 @@
         "android/hardware/tests/bar/1.0/ImportTypes.vts.h",
         "android/hardware/tests/bar/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -72,7 +74,7 @@
 genrule {
     name: "android.hardware.tests.bar@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.bar@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/bar/1.0/ $(genDir)/android/hardware/tests/bar/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.bar@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/bar/1.0/ $(genDir)/android/hardware/tests/bar/1.0/",
     srcs: [
         ":android.hardware.tests.bar@1.0_hal",
     ],
@@ -84,12 +86,13 @@
         "android/hardware/tests/bar/1.0/ImportTypes.vts.cpp",
         "android/hardware/tests/bar/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.bar@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.bar@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/bar/1.0/ $(genDir)/android/hardware/tests/bar/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.bar@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/bar/1.0/ $(genDir)/android/hardware/tests/bar/1.0/",
     srcs: [
         ":android.hardware.tests.bar@1.0_hal",
     ],
@@ -101,6 +104,7 @@
         "android/hardware/tests/bar/1.0/ImportTypes.vts.h",
         "android/hardware/tests/bar/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/tests/baz/V1_0/build/Android.bp b/tests/baz/V1_0/build/Android.bp
index 5b9dbac..9112d73 100644
--- a/tests/baz/V1_0/build/Android.bp
+++ b/tests/baz/V1_0/build/Android.bp
@@ -21,7 +21,7 @@
 genrule {
     name: "android.hardware.tests.baz@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.baz@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/baz/1.0/ $(genDir)/android/hardware/tests/baz/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.baz@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/baz/1.0/ $(genDir)/android/hardware/tests/baz/1.0/",
     srcs: [
         ":android.hardware.tests.baz@1.0_hal",
     ],
@@ -32,12 +32,13 @@
         "android/hardware/tests/baz/1.0/Quux.vts.cpp",
         "android/hardware/tests/baz/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.baz@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.baz@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/baz/1.0/ $(genDir)/android/hardware/tests/baz/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.baz@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/baz/1.0/ $(genDir)/android/hardware/tests/baz/1.0/",
     srcs: [
         ":android.hardware.tests.baz@1.0_hal",
     ],
@@ -48,6 +49,7 @@
         "android/hardware/tests/baz/1.0/Quux.vts.h",
         "android/hardware/tests/baz/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -66,7 +68,7 @@
 genrule {
     name: "android.hardware.tests.baz@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.baz@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/baz/1.0/ $(genDir)/android/hardware/tests/baz/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.baz@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/baz/1.0/ $(genDir)/android/hardware/tests/baz/1.0/",
     srcs: [
         ":android.hardware.tests.baz@1.0_hal",
     ],
@@ -77,12 +79,13 @@
         "android/hardware/tests/baz/1.0/Quux.vts.cpp",
         "android/hardware/tests/baz/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.baz@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.baz@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/baz/1.0/ $(genDir)/android/hardware/tests/baz/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.baz@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/baz/1.0/ $(genDir)/android/hardware/tests/baz/1.0/",
     srcs: [
         ":android.hardware.tests.baz@1.0_hal",
     ],
@@ -93,6 +96,7 @@
         "android/hardware/tests/baz/1.0/Quux.vts.h",
         "android/hardware/tests/baz/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/tests/expression/V1_0/build/Android.bp b/tests/expression/V1_0/build/Android.bp
index 279884a..f3aaec6 100644
--- a/tests/expression/V1_0/build/Android.bp
+++ b/tests/expression/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.tests.expression@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.expression@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/expression/1.0/ $(genDir)/android/hardware/tests/expression/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.expression@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/expression/1.0/ $(genDir)/android/hardware/tests/expression/1.0/",
     srcs: [
         ":android.hardware.tests.expression@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/tests/expression/1.0/Expression.vts.cpp",
         "android/hardware/tests/expression/1.0/ExpressionExt.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.expression@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.expression@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/expression/1.0/ $(genDir)/android/hardware/tests/expression/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.expression@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/expression/1.0/ $(genDir)/android/hardware/tests/expression/1.0/",
     srcs: [
         ":android.hardware.tests.expression@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/tests/expression/1.0/Expression.vts.h",
         "android/hardware/tests/expression/1.0/ExpressionExt.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.tests.expression@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.expression@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/expression/1.0/ $(genDir)/android/hardware/tests/expression/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.expression@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/expression/1.0/ $(genDir)/android/hardware/tests/expression/1.0/",
     srcs: [
         ":android.hardware.tests.expression@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/tests/expression/1.0/Expression.vts.cpp",
         "android/hardware/tests/expression/1.0/ExpressionExt.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.expression@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.expression@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/expression/1.0/ $(genDir)/android/hardware/tests/expression/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.expression@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/expression/1.0/ $(genDir)/android/hardware/tests/expression/1.0/",
     srcs: [
         ":android.hardware.tests.expression@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/tests/expression/1.0/Expression.vts.h",
         "android/hardware/tests/expression/1.0/ExpressionExt.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/tests/extension/light/V2_0/build/Android.bp b/tests/extension/light/V2_0/build/Android.bp
index 68b183e..0c1f6c6 100644
--- a/tests/extension/light/V2_0/build/Android.bp
+++ b/tests/extension/light/V2_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.tests.extension.light@2.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.extension.light@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/extension/light/2.0/ $(genDir)/android/hardware/tests/extension/light/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.extension.light@2.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/extension/light/2.0/ $(genDir)/android/hardware/tests/extension/light/2.0/",
     srcs: [
         ":android.hardware.tests.extension.light@2.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/tests/extension/light/2.0/Light.vts.cpp",
         "android/hardware/tests/extension/light/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.extension.light@2.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.extension.light@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/extension/light/2.0/ $(genDir)/android/hardware/tests/extension/light/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.extension.light@2.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/extension/light/2.0/ $(genDir)/android/hardware/tests/extension/light/2.0/",
     srcs: [
         ":android.hardware.tests.extension.light@2.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/tests/extension/light/2.0/Light.vts.h",
         "android/hardware/tests/extension/light/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.tests.extension.light@2.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.extension.light@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/extension/light/2.0/ $(genDir)/android/hardware/tests/extension/light/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.extension.light@2.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/extension/light/2.0/ $(genDir)/android/hardware/tests/extension/light/2.0/",
     srcs: [
         ":android.hardware.tests.extension.light@2.0_hal",
     ],
@@ -68,12 +70,13 @@
         "android/hardware/tests/extension/light/2.0/Light.vts.cpp",
         "android/hardware/tests/extension/light/2.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.extension.light@2.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.extension.light@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/extension/light/2.0/ $(genDir)/android/hardware/tests/extension/light/2.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.extension.light@2.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/extension/light/2.0/ $(genDir)/android/hardware/tests/extension/light/2.0/",
     srcs: [
         ":android.hardware.tests.extension.light@2.0_hal",
     ],
@@ -81,6 +84,7 @@
         "android/hardware/tests/extension/light/2.0/Light.vts.h",
         "android/hardware/tests/extension/light/2.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/tests/foo/V1_0/build/Android.bp b/tests/foo/V1_0/build/Android.bp
index 356eb7e..3d2712d 100644
--- a/tests/foo/V1_0/build/Android.bp
+++ b/tests/foo/V1_0/build/Android.bp
@@ -22,7 +22,7 @@
 genrule {
     name: "android.hardware.tests.foo@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.foo@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/foo/1.0/ $(genDir)/android/hardware/tests/foo/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.foo@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/foo/1.0/ $(genDir)/android/hardware/tests/foo/1.0/",
     srcs: [
         ":android.hardware.tests.foo@1.0_hal",
     ],
@@ -34,12 +34,13 @@
         "android/hardware/tests/foo/1.0/TheirTypes.vts.cpp",
         "android/hardware/tests/foo/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.foo@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.foo@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/foo/1.0/ $(genDir)/android/hardware/tests/foo/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.foo@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/foo/1.0/ $(genDir)/android/hardware/tests/foo/1.0/",
     srcs: [
         ":android.hardware.tests.foo@1.0_hal",
     ],
@@ -51,6 +52,7 @@
         "android/hardware/tests/foo/1.0/TheirTypes.vts.h",
         "android/hardware/tests/foo/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -69,7 +71,7 @@
 genrule {
     name: "android.hardware.tests.foo@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.foo@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/foo/1.0/ $(genDir)/android/hardware/tests/foo/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.foo@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/foo/1.0/ $(genDir)/android/hardware/tests/foo/1.0/",
     srcs: [
         ":android.hardware.tests.foo@1.0_hal",
     ],
@@ -81,12 +83,13 @@
         "android/hardware/tests/foo/1.0/TheirTypes.vts.cpp",
         "android/hardware/tests/foo/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.foo@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.foo@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/foo/1.0/ $(genDir)/android/hardware/tests/foo/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.foo@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/foo/1.0/ $(genDir)/android/hardware/tests/foo/1.0/",
     srcs: [
         ":android.hardware.tests.foo@1.0_hal",
     ],
@@ -98,6 +101,7 @@
         "android/hardware/tests/foo/1.0/TheirTypes.vts.h",
         "android/hardware/tests/foo/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/tests/hash/V1_0/build/Android.bp b/tests/hash/V1_0/build/Android.bp
index 7c05925..73b9e4c 100644
--- a/tests/hash/V1_0/build/Android.bp
+++ b/tests/hash/V1_0/build/Android.bp
@@ -17,25 +17,27 @@
 genrule {
     name: "android.hardware.tests.hash@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.hash@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/hash/1.0/ $(genDir)/android/hardware/tests/hash/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.hash@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/hash/1.0/ $(genDir)/android/hardware/tests/hash/1.0/",
     srcs: [
         ":android.hardware.tests.hash@1.0_hal",
     ],
     out: [
         "android/hardware/tests/hash/1.0/Hash.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.hash@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.hash@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/hash/1.0/ $(genDir)/android/hardware/tests/hash/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.hash@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/hash/1.0/ $(genDir)/android/hardware/tests/hash/1.0/",
     srcs: [
         ":android.hardware.tests.hash@1.0_hal",
     ],
     out: [
         "android/hardware/tests/hash/1.0/Hash.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -54,25 +56,27 @@
 genrule {
     name: "android.hardware.tests.hash@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.hash@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/hash/1.0/ $(genDir)/android/hardware/tests/hash/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.hash@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/hash/1.0/ $(genDir)/android/hardware/tests/hash/1.0/",
     srcs: [
         ":android.hardware.tests.hash@1.0_hal",
     ],
     out: [
         "android/hardware/tests/hash/1.0/Hash.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.hash@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.hash@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/hash/1.0/ $(genDir)/android/hardware/tests/hash/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.hash@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/hash/1.0/ $(genDir)/android/hardware/tests/hash/1.0/",
     srcs: [
         ":android.hardware.tests.hash@1.0_hal",
     ],
     out: [
         "android/hardware/tests/hash/1.0/Hash.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/tests/inheritance/V1_0/build/Android.bp b/tests/inheritance/V1_0/build/Android.bp
index 2307c90..9aff4ed 100644
--- a/tests/inheritance/V1_0/build/Android.bp
+++ b/tests/inheritance/V1_0/build/Android.bp
@@ -20,7 +20,7 @@
 genrule {
     name: "android.hardware.tests.inheritance@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.inheritance@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/inheritance/1.0/ $(genDir)/android/hardware/tests/inheritance/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.inheritance@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/inheritance/1.0/ $(genDir)/android/hardware/tests/inheritance/1.0/",
     srcs: [
         ":android.hardware.tests.inheritance@1.0_hal",
     ],
@@ -30,12 +30,13 @@
         "android/hardware/tests/inheritance/1.0/Grandparent.vts.cpp",
         "android/hardware/tests/inheritance/1.0/Parent.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.inheritance@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.inheritance@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/inheritance/1.0/ $(genDir)/android/hardware/tests/inheritance/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.inheritance@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/inheritance/1.0/ $(genDir)/android/hardware/tests/inheritance/1.0/",
     srcs: [
         ":android.hardware.tests.inheritance@1.0_hal",
     ],
@@ -45,6 +46,7 @@
         "android/hardware/tests/inheritance/1.0/Grandparent.vts.h",
         "android/hardware/tests/inheritance/1.0/Parent.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -63,7 +65,7 @@
 genrule {
     name: "android.hardware.tests.inheritance@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.inheritance@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/inheritance/1.0/ $(genDir)/android/hardware/tests/inheritance/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.inheritance@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/inheritance/1.0/ $(genDir)/android/hardware/tests/inheritance/1.0/",
     srcs: [
         ":android.hardware.tests.inheritance@1.0_hal",
     ],
@@ -73,12 +75,13 @@
         "android/hardware/tests/inheritance/1.0/Grandparent.vts.cpp",
         "android/hardware/tests/inheritance/1.0/Parent.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.inheritance@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.inheritance@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/inheritance/1.0/ $(genDir)/android/hardware/tests/inheritance/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.inheritance@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/inheritance/1.0/ $(genDir)/android/hardware/tests/inheritance/1.0/",
     srcs: [
         ":android.hardware.tests.inheritance@1.0_hal",
     ],
@@ -88,6 +91,7 @@
         "android/hardware/tests/inheritance/1.0/Grandparent.vts.h",
         "android/hardware/tests/inheritance/1.0/Parent.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/tests/libhwbinder/V1_0/build/Android.bp b/tests/libhwbinder/V1_0/build/Android.bp
index 13f29e9..c82336d 100644
--- a/tests/libhwbinder/V1_0/build/Android.bp
+++ b/tests/libhwbinder/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.tests.libhwbinder@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.libhwbinder@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/libhwbinder/1.0/ $(genDir)/android/hardware/tests/libhwbinder/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.libhwbinder@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/libhwbinder/1.0/ $(genDir)/android/hardware/tests/libhwbinder/1.0/",
     srcs: [
         ":android.hardware.tests.libhwbinder@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/tests/libhwbinder/1.0/Benchmark.vts.cpp",
         "android/hardware/tests/libhwbinder/1.0/ScheduleTest.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.libhwbinder@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.libhwbinder@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/libhwbinder/1.0/ $(genDir)/android/hardware/tests/libhwbinder/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.libhwbinder@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/libhwbinder/1.0/ $(genDir)/android/hardware/tests/libhwbinder/1.0/",
     srcs: [
         ":android.hardware.tests.libhwbinder@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/tests/libhwbinder/1.0/Benchmark.vts.h",
         "android/hardware/tests/libhwbinder/1.0/ScheduleTest.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.tests.libhwbinder@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.libhwbinder@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/libhwbinder/1.0/ $(genDir)/android/hardware/tests/libhwbinder/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.libhwbinder@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/libhwbinder/1.0/ $(genDir)/android/hardware/tests/libhwbinder/1.0/",
     srcs: [
         ":android.hardware.tests.libhwbinder@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/tests/libhwbinder/1.0/Benchmark.vts.cpp",
         "android/hardware/tests/libhwbinder/1.0/ScheduleTest.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.libhwbinder@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.libhwbinder@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/libhwbinder/1.0/ $(genDir)/android/hardware/tests/libhwbinder/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.libhwbinder@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/libhwbinder/1.0/ $(genDir)/android/hardware/tests/libhwbinder/1.0/",
     srcs: [
         ":android.hardware.tests.libhwbinder@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/tests/libhwbinder/1.0/Benchmark.vts.h",
         "android/hardware/tests/libhwbinder/1.0/ScheduleTest.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/tests/memory/V1_0/build/Android.bp b/tests/memory/V1_0/build/Android.bp
index c47d5a1..95684f6 100644
--- a/tests/memory/V1_0/build/Android.bp
+++ b/tests/memory/V1_0/build/Android.bp
@@ -17,25 +17,27 @@
 genrule {
     name: "android.hardware.tests.memory@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.memory@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/memory/1.0/ $(genDir)/android/hardware/tests/memory/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.memory@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/memory/1.0/ $(genDir)/android/hardware/tests/memory/1.0/",
     srcs: [
         ":android.hardware.tests.memory@1.0_hal",
     ],
     out: [
         "android/hardware/tests/memory/1.0/MemoryTest.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.memory@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.memory@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/memory/1.0/ $(genDir)/android/hardware/tests/memory/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.memory@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/memory/1.0/ $(genDir)/android/hardware/tests/memory/1.0/",
     srcs: [
         ":android.hardware.tests.memory@1.0_hal",
     ],
     out: [
         "android/hardware/tests/memory/1.0/MemoryTest.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -59,25 +61,27 @@
 genrule {
     name: "android.hardware.tests.memory@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.memory@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/memory/1.0/ $(genDir)/android/hardware/tests/memory/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.memory@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/memory/1.0/ $(genDir)/android/hardware/tests/memory/1.0/",
     srcs: [
         ":android.hardware.tests.memory@1.0_hal",
     ],
     out: [
         "android/hardware/tests/memory/1.0/MemoryTest.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.memory@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.memory@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/memory/1.0/ $(genDir)/android/hardware/tests/memory/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.memory@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/memory/1.0/ $(genDir)/android/hardware/tests/memory/1.0/",
     srcs: [
         ":android.hardware.tests.memory@1.0_hal",
     ],
     out: [
         "android/hardware/tests/memory/1.0/MemoryTest.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/tests/msgq/V1_0/build/Android.bp b/tests/msgq/V1_0/build/Android.bp
index 100d4a4..ef0e1af 100644
--- a/tests/msgq/V1_0/build/Android.bp
+++ b/tests/msgq/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.tests.msgq@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.msgq@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/msgq/1.0/ $(genDir)/android/hardware/tests/msgq/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.msgq@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/msgq/1.0/ $(genDir)/android/hardware/tests/msgq/1.0/",
     srcs: [
         ":android.hardware.tests.msgq@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/tests/msgq/1.0/BenchmarkMsgQ.vts.cpp",
         "android/hardware/tests/msgq/1.0/TestMsgQ.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.msgq@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.msgq@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/msgq/1.0/ $(genDir)/android/hardware/tests/msgq/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.msgq@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/msgq/1.0/ $(genDir)/android/hardware/tests/msgq/1.0/",
     srcs: [
         ":android.hardware.tests.msgq@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/tests/msgq/1.0/BenchmarkMsgQ.vts.h",
         "android/hardware/tests/msgq/1.0/TestMsgQ.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.tests.msgq@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.msgq@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/msgq/1.0/ $(genDir)/android/hardware/tests/msgq/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.msgq@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/msgq/1.0/ $(genDir)/android/hardware/tests/msgq/1.0/",
     srcs: [
         ":android.hardware.tests.msgq@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/tests/msgq/1.0/BenchmarkMsgQ.vts.cpp",
         "android/hardware/tests/msgq/1.0/TestMsgQ.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.msgq@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.msgq@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/msgq/1.0/ $(genDir)/android/hardware/tests/msgq/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.msgq@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/msgq/1.0/ $(genDir)/android/hardware/tests/msgq/1.0/",
     srcs: [
         ":android.hardware.tests.msgq@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/tests/msgq/1.0/BenchmarkMsgQ.vts.h",
         "android/hardware/tests/msgq/1.0/TestMsgQ.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/tests/multithread/V1_0/build/Android.bp b/tests/multithread/V1_0/build/Android.bp
index f526fe1..eb940be 100644
--- a/tests/multithread/V1_0/build/Android.bp
+++ b/tests/multithread/V1_0/build/Android.bp
@@ -17,25 +17,27 @@
 genrule {
     name: "android.hardware.tests.multithread@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.multithread@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/multithread/1.0/ $(genDir)/android/hardware/tests/multithread/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.multithread@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/multithread/1.0/ $(genDir)/android/hardware/tests/multithread/1.0/",
     srcs: [
         ":android.hardware.tests.multithread@1.0_hal",
     ],
     out: [
         "android/hardware/tests/multithread/1.0/Multithread.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.multithread@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.multithread@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/multithread/1.0/ $(genDir)/android/hardware/tests/multithread/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.multithread@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/multithread/1.0/ $(genDir)/android/hardware/tests/multithread/1.0/",
     srcs: [
         ":android.hardware.tests.multithread@1.0_hal",
     ],
     out: [
         "android/hardware/tests/multithread/1.0/Multithread.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -54,25 +56,27 @@
 genrule {
     name: "android.hardware.tests.multithread@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.multithread@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/multithread/1.0/ $(genDir)/android/hardware/tests/multithread/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.multithread@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/multithread/1.0/ $(genDir)/android/hardware/tests/multithread/1.0/",
     srcs: [
         ":android.hardware.tests.multithread@1.0_hal",
     ],
     out: [
         "android/hardware/tests/multithread/1.0/Multithread.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.multithread@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.multithread@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/multithread/1.0/ $(genDir)/android/hardware/tests/multithread/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.multithread@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/multithread/1.0/ $(genDir)/android/hardware/tests/multithread/1.0/",
     srcs: [
         ":android.hardware.tests.multithread@1.0_hal",
     ],
     out: [
         "android/hardware/tests/multithread/1.0/Multithread.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/tests/pointer/V1_0/build/Android.bp b/tests/pointer/V1_0/build/Android.bp
index 7fce1dd..f5c0cc4 100644
--- a/tests/pointer/V1_0/build/Android.bp
+++ b/tests/pointer/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.tests.pointer@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.pointer@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/pointer/1.0/ $(genDir)/android/hardware/tests/pointer/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.pointer@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/pointer/1.0/ $(genDir)/android/hardware/tests/pointer/1.0/",
     srcs: [
         ":android.hardware.tests.pointer@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/tests/pointer/1.0/Graph.vts.cpp",
         "android/hardware/tests/pointer/1.0/Pointer.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.pointer@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.pointer@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/pointer/1.0/ $(genDir)/android/hardware/tests/pointer/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.pointer@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/pointer/1.0/ $(genDir)/android/hardware/tests/pointer/1.0/",
     srcs: [
         ":android.hardware.tests.pointer@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/tests/pointer/1.0/Graph.vts.h",
         "android/hardware/tests/pointer/1.0/Pointer.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.tests.pointer@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.pointer@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/pointer/1.0/ $(genDir)/android/hardware/tests/pointer/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.pointer@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/pointer/1.0/ $(genDir)/android/hardware/tests/pointer/1.0/",
     srcs: [
         ":android.hardware.tests.pointer@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/tests/pointer/1.0/Graph.vts.cpp",
         "android/hardware/tests/pointer/1.0/Pointer.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.pointer@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.pointer@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/pointer/1.0/ $(genDir)/android/hardware/tests/pointer/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.pointer@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/pointer/1.0/ $(genDir)/android/hardware/tests/pointer/1.0/",
     srcs: [
         ":android.hardware.tests.pointer@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/tests/pointer/1.0/Graph.vts.h",
         "android/hardware/tests/pointer/1.0/Pointer.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/tests/safeunion/V1_0/build/Android.bp b/tests/safeunion/V1_0/build/Android.bp
index 8dc3b00..0417aa7 100644
--- a/tests/safeunion/V1_0/build/Android.bp
+++ b/tests/safeunion/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.tests.safeunion@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.safeunion@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/safeunion/1.0/ $(genDir)/android/hardware/tests/safeunion/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.safeunion@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/safeunion/1.0/ $(genDir)/android/hardware/tests/safeunion/1.0/",
     srcs: [
         ":android.hardware.tests.safeunion@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/tests/safeunion/1.0/OtherInterface.vts.cpp",
         "android/hardware/tests/safeunion/1.0/SafeUnion.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.safeunion@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.safeunion@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/safeunion/1.0/ $(genDir)/android/hardware/tests/safeunion/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.safeunion@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/safeunion/1.0/ $(genDir)/android/hardware/tests/safeunion/1.0/",
     srcs: [
         ":android.hardware.tests.safeunion@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/tests/safeunion/1.0/OtherInterface.vts.h",
         "android/hardware/tests/safeunion/1.0/SafeUnion.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.tests.safeunion@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.safeunion@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/safeunion/1.0/ $(genDir)/android/hardware/tests/safeunion/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.safeunion@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/safeunion/1.0/ $(genDir)/android/hardware/tests/safeunion/1.0/",
     srcs: [
         ":android.hardware.tests.safeunion@1.0_hal",
     ],
@@ -68,12 +70,13 @@
         "android/hardware/tests/safeunion/1.0/OtherInterface.vts.cpp",
         "android/hardware/tests/safeunion/1.0/SafeUnion.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.safeunion@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.safeunion@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/safeunion/1.0/ $(genDir)/android/hardware/tests/safeunion/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.safeunion@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/safeunion/1.0/ $(genDir)/android/hardware/tests/safeunion/1.0/",
     srcs: [
         ":android.hardware.tests.safeunion@1.0_hal",
     ],
@@ -81,6 +84,7 @@
         "android/hardware/tests/safeunion/1.0/OtherInterface.vts.h",
         "android/hardware/tests/safeunion/1.0/SafeUnion.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/tests/trie/V1_0/build/Android.bp b/tests/trie/V1_0/build/Android.bp
index 18c1b4a..35fc95c 100644
--- a/tests/trie/V1_0/build/Android.bp
+++ b/tests/trie/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.tests.trie@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.trie@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/trie/1.0/ $(genDir)/android/hardware/tests/trie/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.trie@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tests/trie/1.0/ $(genDir)/android/hardware/tests/trie/1.0/",
     srcs: [
         ":android.hardware.tests.trie@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/tests/trie/1.0/Trie.vts.cpp",
         "android/hardware/tests/trie/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.trie@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.trie@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/trie/1.0/ $(genDir)/android/hardware/tests/trie/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.trie@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tests/trie/1.0/ $(genDir)/android/hardware/tests/trie/1.0/",
     srcs: [
         ":android.hardware.tests.trie@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/tests/trie/1.0/Trie.vts.h",
         "android/hardware/tests/trie/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.tests.trie@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.trie@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/trie/1.0/ $(genDir)/android/hardware/tests/trie/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.trie@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tests/trie/1.0/ $(genDir)/android/hardware/tests/trie/1.0/",
     srcs: [
         ":android.hardware.tests.trie@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/tests/trie/1.0/Trie.vts.cpp",
         "android/hardware/tests/trie/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tests.trie@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.trie@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/trie/1.0/ $(genDir)/android/hardware/tests/trie/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tests.trie@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tests/trie/1.0/ $(genDir)/android/hardware/tests/trie/1.0/",
     srcs: [
         ":android.hardware.tests.trie@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/tests/trie/1.0/Trie.vts.h",
         "android/hardware/tests/trie/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/tetheroffload/config/V1_0/build/Android.bp b/tetheroffload/config/V1_0/build/Android.bp
index 8be1fe3..6f9951f 100644
--- a/tetheroffload/config/V1_0/build/Android.bp
+++ b/tetheroffload/config/V1_0/build/Android.bp
@@ -17,25 +17,27 @@
 genrule {
     name: "android.hardware.tetheroffload.config@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tetheroffload.config@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tetheroffload/config/1.0/ $(genDir)/android/hardware/tetheroffload/config/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tetheroffload.config@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tetheroffload/config/1.0/ $(genDir)/android/hardware/tetheroffload/config/1.0/",
     srcs: [
         ":android.hardware.tetheroffload.config@1.0_hal",
     ],
     out: [
         "android/hardware/tetheroffload/config/1.0/OffloadConfig.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tetheroffload.config@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tetheroffload.config@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tetheroffload/config/1.0/ $(genDir)/android/hardware/tetheroffload/config/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tetheroffload.config@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tetheroffload/config/1.0/ $(genDir)/android/hardware/tetheroffload/config/1.0/",
     srcs: [
         ":android.hardware.tetheroffload.config@1.0_hal",
     ],
     out: [
         "android/hardware/tetheroffload/config/1.0/OffloadConfig.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -54,25 +56,27 @@
 genrule {
     name: "android.hardware.tetheroffload.config@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tetheroffload.config@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tetheroffload/config/1.0/ $(genDir)/android/hardware/tetheroffload/config/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tetheroffload.config@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tetheroffload/config/1.0/ $(genDir)/android/hardware/tetheroffload/config/1.0/",
     srcs: [
         ":android.hardware.tetheroffload.config@1.0_hal",
     ],
     out: [
         "android/hardware/tetheroffload/config/1.0/OffloadConfig.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tetheroffload.config@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tetheroffload.config@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tetheroffload/config/1.0/ $(genDir)/android/hardware/tetheroffload/config/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tetheroffload.config@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tetheroffload/config/1.0/ $(genDir)/android/hardware/tetheroffload/config/1.0/",
     srcs: [
         ":android.hardware.tetheroffload.config@1.0_hal",
     ],
     out: [
         "android/hardware/tetheroffload/config/1.0/OffloadConfig.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/tetheroffload/control/V1_0/build/Android.bp b/tetheroffload/control/V1_0/build/Android.bp
index 8d51a63..95ad3f4 100644
--- a/tetheroffload/control/V1_0/build/Android.bp
+++ b/tetheroffload/control/V1_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.tetheroffload.control@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tetheroffload.control@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tetheroffload/control/1.0/ $(genDir)/android/hardware/tetheroffload/control/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tetheroffload.control@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tetheroffload/control/1.0/ $(genDir)/android/hardware/tetheroffload/control/1.0/",
     srcs: [
         ":android.hardware.tetheroffload.control@1.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/tetheroffload/control/1.0/TetheringOffloadCallback.vts.cpp",
         "android/hardware/tetheroffload/control/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tetheroffload.control@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tetheroffload.control@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tetheroffload/control/1.0/ $(genDir)/android/hardware/tetheroffload/control/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tetheroffload.control@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tetheroffload/control/1.0/ $(genDir)/android/hardware/tetheroffload/control/1.0/",
     srcs: [
         ":android.hardware.tetheroffload.control@1.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/tetheroffload/control/1.0/TetheringOffloadCallback.vts.h",
         "android/hardware/tetheroffload/control/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.tetheroffload.control@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tetheroffload.control@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tetheroffload/control/1.0/ $(genDir)/android/hardware/tetheroffload/control/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tetheroffload.control@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tetheroffload/control/1.0/ $(genDir)/android/hardware/tetheroffload/control/1.0/",
     srcs: [
         ":android.hardware.tetheroffload.control@1.0_hal",
     ],
@@ -69,12 +71,13 @@
         "android/hardware/tetheroffload/control/1.0/TetheringOffloadCallback.vts.cpp",
         "android/hardware/tetheroffload/control/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tetheroffload.control@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tetheroffload.control@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tetheroffload/control/1.0/ $(genDir)/android/hardware/tetheroffload/control/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tetheroffload.control@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tetheroffload/control/1.0/ $(genDir)/android/hardware/tetheroffload/control/1.0/",
     srcs: [
         ":android.hardware.tetheroffload.control@1.0_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/tetheroffload/control/1.0/TetheringOffloadCallback.vts.h",
         "android/hardware/tetheroffload/control/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/thermal/V1_0/build/Android.bp b/thermal/V1_0/build/Android.bp
index 2858248..67069a4 100644
--- a/thermal/V1_0/build/Android.bp
+++ b/thermal/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.thermal@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.thermal@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/thermal/1.0/ $(genDir)/android/hardware/thermal/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.thermal@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/thermal/1.0/ $(genDir)/android/hardware/thermal/1.0/",
     srcs: [
         ":android.hardware.thermal@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/thermal/1.0/Thermal.vts.cpp",
         "android/hardware/thermal/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.thermal@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.thermal@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/thermal/1.0/ $(genDir)/android/hardware/thermal/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.thermal@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/thermal/1.0/ $(genDir)/android/hardware/thermal/1.0/",
     srcs: [
         ":android.hardware.thermal@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/thermal/1.0/Thermal.vts.h",
         "android/hardware/thermal/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.thermal@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.thermal@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/thermal/1.0/ $(genDir)/android/hardware/thermal/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.thermal@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/thermal/1.0/ $(genDir)/android/hardware/thermal/1.0/",
     srcs: [
         ":android.hardware.thermal@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/thermal/1.0/Thermal.vts.cpp",
         "android/hardware/thermal/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.thermal@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.thermal@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/thermal/1.0/ $(genDir)/android/hardware/thermal/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.thermal@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/thermal/1.0/ $(genDir)/android/hardware/thermal/1.0/",
     srcs: [
         ":android.hardware.thermal@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/thermal/1.0/Thermal.vts.h",
         "android/hardware/thermal/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/thermal/V1_1/build/Android.bp b/thermal/V1_1/build/Android.bp
index 4e778b7..33bba03 100644
--- a/thermal/V1_1/build/Android.bp
+++ b/thermal/V1_1/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.thermal@1.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.thermal@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/thermal/1.1/ $(genDir)/android/hardware/thermal/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.thermal@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/thermal/1.1/ $(genDir)/android/hardware/thermal/1.1/",
     srcs: [
         ":android.hardware.thermal@1.1_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/thermal/1.1/Thermal.vts.cpp",
         "android/hardware/thermal/1.1/ThermalCallback.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.thermal@1.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.thermal@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/thermal/1.1/ $(genDir)/android/hardware/thermal/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.thermal@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/thermal/1.1/ $(genDir)/android/hardware/thermal/1.1/",
     srcs: [
         ":android.hardware.thermal@1.1_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/thermal/1.1/Thermal.vts.h",
         "android/hardware/thermal/1.1/ThermalCallback.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.thermal@1.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.thermal@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/thermal/1.1/ $(genDir)/android/hardware/thermal/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.thermal@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/thermal/1.1/ $(genDir)/android/hardware/thermal/1.1/",
     srcs: [
         ":android.hardware.thermal@1.1_hal",
     ],
@@ -68,12 +70,13 @@
         "android/hardware/thermal/1.1/Thermal.vts.cpp",
         "android/hardware/thermal/1.1/ThermalCallback.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.thermal@1.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.thermal@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/thermal/1.1/ $(genDir)/android/hardware/thermal/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.thermal@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/thermal/1.1/ $(genDir)/android/hardware/thermal/1.1/",
     srcs: [
         ":android.hardware.thermal@1.1_hal",
     ],
@@ -81,6 +84,7 @@
         "android/hardware/thermal/1.1/Thermal.vts.h",
         "android/hardware/thermal/1.1/ThermalCallback.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/treble/vintf/utils.cpp b/treble/vintf/utils.cpp
index cb8839f..d1d53b3 100644
--- a/treble/vintf/utils.cpp
+++ b/treble/vintf/utils.cpp
@@ -73,7 +73,9 @@
                       // O MR-1
                       {27, static_cast<Level>(2)},
                       // P
-                      {28, static_cast<Level>(3)}}};
+                      {28, static_cast<Level>(3)},
+                      // Q
+                      {29, static_cast<Level>(4)}}};
 
 // Returns ro.product.first_api_level if it is defined and not 0. Returns
 // ro.build.version.sdk otherwise.
diff --git a/tv/cec/V1_0/build/Android.bp b/tv/cec/V1_0/build/Android.bp
index cb51251..ef4370f 100644
--- a/tv/cec/V1_0/build/Android.bp
+++ b/tv/cec/V1_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.tv.cec@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tv.cec@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tv/cec/1.0/ $(genDir)/android/hardware/tv/cec/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tv.cec@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tv/cec/1.0/ $(genDir)/android/hardware/tv/cec/1.0/",
     srcs: [
         ":android.hardware.tv.cec@1.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/tv/cec/1.0/HdmiCecCallback.vts.cpp",
         "android/hardware/tv/cec/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tv.cec@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tv.cec@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tv/cec/1.0/ $(genDir)/android/hardware/tv/cec/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tv.cec@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tv/cec/1.0/ $(genDir)/android/hardware/tv/cec/1.0/",
     srcs: [
         ":android.hardware.tv.cec@1.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/tv/cec/1.0/HdmiCecCallback.vts.h",
         "android/hardware/tv/cec/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.tv.cec@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tv.cec@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tv/cec/1.0/ $(genDir)/android/hardware/tv/cec/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tv.cec@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tv/cec/1.0/ $(genDir)/android/hardware/tv/cec/1.0/",
     srcs: [
         ":android.hardware.tv.cec@1.0_hal",
     ],
@@ -69,12 +71,13 @@
         "android/hardware/tv/cec/1.0/HdmiCecCallback.vts.cpp",
         "android/hardware/tv/cec/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tv.cec@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tv.cec@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tv/cec/1.0/ $(genDir)/android/hardware/tv/cec/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tv.cec@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tv/cec/1.0/ $(genDir)/android/hardware/tv/cec/1.0/",
     srcs: [
         ":android.hardware.tv.cec@1.0_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/tv/cec/1.0/HdmiCecCallback.vts.h",
         "android/hardware/tv/cec/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/tv/input/V1_0/build/Android.bp b/tv/input/V1_0/build/Android.bp
index ad4b529..ba571e4 100644
--- a/tv/input/V1_0/build/Android.bp
+++ b/tv/input/V1_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.tv.input@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tv.input@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tv/input/1.0/ $(genDir)/android/hardware/tv/input/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tv.input@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/tv/input/1.0/ $(genDir)/android/hardware/tv/input/1.0/",
     srcs: [
         ":android.hardware.tv.input@1.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/tv/input/1.0/TvInputCallback.vts.cpp",
         "android/hardware/tv/input/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tv.input@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tv.input@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tv/input/1.0/ $(genDir)/android/hardware/tv/input/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tv.input@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/tv/input/1.0/ $(genDir)/android/hardware/tv/input/1.0/",
     srcs: [
         ":android.hardware.tv.input@1.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/tv/input/1.0/TvInputCallback.vts.h",
         "android/hardware/tv/input/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -63,7 +65,7 @@
 genrule {
     name: "android.hardware.tv.input@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tv.input@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tv/input/1.0/ $(genDir)/android/hardware/tv/input/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tv.input@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/tv/input/1.0/ $(genDir)/android/hardware/tv/input/1.0/",
     srcs: [
         ":android.hardware.tv.input@1.0_hal",
     ],
@@ -72,12 +74,13 @@
         "android/hardware/tv/input/1.0/TvInputCallback.vts.cpp",
         "android/hardware/tv/input/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.tv.input@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tv.input@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tv/input/1.0/ $(genDir)/android/hardware/tv/input/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.tv.input@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/tv/input/1.0/ $(genDir)/android/hardware/tv/input/1.0/",
     srcs: [
         ":android.hardware.tv.input@1.0_hal",
     ],
@@ -86,6 +89,7 @@
         "android/hardware/tv/input/1.0/TvInputCallback.vts.h",
         "android/hardware/tv/input/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/usb/V1_0/build/Android.bp b/usb/V1_0/build/Android.bp
index a049b24..f519fa6 100644
--- a/usb/V1_0/build/Android.bp
+++ b/usb/V1_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.usb@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/usb/1.0/ $(genDir)/android/hardware/usb/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/usb/1.0/ $(genDir)/android/hardware/usb/1.0/",
     srcs: [
         ":android.hardware.usb@1.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/usb/1.0/UsbCallback.vts.cpp",
         "android/hardware/usb/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.usb@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/usb/1.0/ $(genDir)/android/hardware/usb/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/usb/1.0/ $(genDir)/android/hardware/usb/1.0/",
     srcs: [
         ":android.hardware.usb@1.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/usb/1.0/UsbCallback.vts.h",
         "android/hardware/usb/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.usb@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/usb/1.0/ $(genDir)/android/hardware/usb/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/usb/1.0/ $(genDir)/android/hardware/usb/1.0/",
     srcs: [
         ":android.hardware.usb@1.0_hal",
     ],
@@ -69,12 +71,13 @@
         "android/hardware/usb/1.0/UsbCallback.vts.cpp",
         "android/hardware/usb/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.usb@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/usb/1.0/ $(genDir)/android/hardware/usb/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/usb/1.0/ $(genDir)/android/hardware/usb/1.0/",
     srcs: [
         ":android.hardware.usb@1.0_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/usb/1.0/UsbCallback.vts.h",
         "android/hardware/usb/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/usb/V1_1/build/Android.bp b/usb/V1_1/build/Android.bp
index 2ea7311..44a1398 100644
--- a/usb/V1_1/build/Android.bp
+++ b/usb/V1_1/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.usb@1.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/usb/1.1/ $(genDir)/android/hardware/usb/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/usb/1.1/ $(genDir)/android/hardware/usb/1.1/",
     srcs: [
         ":android.hardware.usb@1.1_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/usb/1.1/UsbCallback.vts.cpp",
         "android/hardware/usb/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.usb@1.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/usb/1.1/ $(genDir)/android/hardware/usb/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/usb/1.1/ $(genDir)/android/hardware/usb/1.1/",
     srcs: [
         ":android.hardware.usb@1.1_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/usb/1.1/UsbCallback.vts.h",
         "android/hardware/usb/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -63,7 +65,7 @@
 genrule {
     name: "android.hardware.usb@1.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/usb/1.1/ $(genDir)/android/hardware/usb/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/usb/1.1/ $(genDir)/android/hardware/usb/1.1/",
     srcs: [
         ":android.hardware.usb@1.1_hal",
     ],
@@ -72,12 +74,13 @@
         "android/hardware/usb/1.1/UsbCallback.vts.cpp",
         "android/hardware/usb/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.usb@1.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/usb/1.1/ $(genDir)/android/hardware/usb/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/usb/1.1/ $(genDir)/android/hardware/usb/1.1/",
     srcs: [
         ":android.hardware.usb@1.1_hal",
     ],
@@ -86,6 +89,7 @@
         "android/hardware/usb/1.1/UsbCallback.vts.h",
         "android/hardware/usb/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/usb/gadget/V1_0/build/Android.bp b/usb/gadget/V1_0/build/Android.bp
index 5098a3c..9471ebc 100644
--- a/usb/gadget/V1_0/build/Android.bp
+++ b/usb/gadget/V1_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.usb.gadget@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb.gadget@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/usb/gadget/1.0/ $(genDir)/android/hardware/usb/gadget/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb.gadget@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/usb/gadget/1.0/ $(genDir)/android/hardware/usb/gadget/1.0/",
     srcs: [
         ":android.hardware.usb.gadget@1.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/usb/gadget/1.0/UsbGadgetCallback.vts.cpp",
         "android/hardware/usb/gadget/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.usb.gadget@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb.gadget@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/usb/gadget/1.0/ $(genDir)/android/hardware/usb/gadget/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb.gadget@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/usb/gadget/1.0/ $(genDir)/android/hardware/usb/gadget/1.0/",
     srcs: [
         ":android.hardware.usb.gadget@1.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/usb/gadget/1.0/UsbGadgetCallback.vts.h",
         "android/hardware/usb/gadget/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.usb.gadget@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb.gadget@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/usb/gadget/1.0/ $(genDir)/android/hardware/usb/gadget/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb.gadget@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/usb/gadget/1.0/ $(genDir)/android/hardware/usb/gadget/1.0/",
     srcs: [
         ":android.hardware.usb.gadget@1.0_hal",
     ],
@@ -69,12 +71,13 @@
         "android/hardware/usb/gadget/1.0/UsbGadgetCallback.vts.cpp",
         "android/hardware/usb/gadget/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.usb.gadget@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb.gadget@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/usb/gadget/1.0/ $(genDir)/android/hardware/usb/gadget/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.usb.gadget@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/usb/gadget/1.0/ $(genDir)/android/hardware/usb/gadget/1.0/",
     srcs: [
         ":android.hardware.usb.gadget@1.0_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/usb/gadget/1.0/UsbGadgetCallback.vts.h",
         "android/hardware/usb/gadget/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/vibrator/V1_0/build/Android.bp b/vibrator/V1_0/build/Android.bp
index 0be3e68..6f528aa 100644
--- a/vibrator/V1_0/build/Android.bp
+++ b/vibrator/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.vibrator@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vibrator/1.0/ $(genDir)/android/hardware/vibrator/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vibrator/1.0/ $(genDir)/android/hardware/vibrator/1.0/",
     srcs: [
         ":android.hardware.vibrator@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/vibrator/1.0/Vibrator.vts.cpp",
         "android/hardware/vibrator/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.vibrator@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vibrator/1.0/ $(genDir)/android/hardware/vibrator/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vibrator/1.0/ $(genDir)/android/hardware/vibrator/1.0/",
     srcs: [
         ":android.hardware.vibrator@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/vibrator/1.0/Vibrator.vts.h",
         "android/hardware/vibrator/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.vibrator@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/vibrator/1.0/ $(genDir)/android/hardware/vibrator/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/vibrator/1.0/ $(genDir)/android/hardware/vibrator/1.0/",
     srcs: [
         ":android.hardware.vibrator@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/vibrator/1.0/Vibrator.vts.cpp",
         "android/hardware/vibrator/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.vibrator@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/vibrator/1.0/ $(genDir)/android/hardware/vibrator/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/vibrator/1.0/ $(genDir)/android/hardware/vibrator/1.0/",
     srcs: [
         ":android.hardware.vibrator@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/vibrator/1.0/Vibrator.vts.h",
         "android/hardware/vibrator/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/vibrator/V1_1/build/Android.bp b/vibrator/V1_1/build/Android.bp
index bd7a297..d5f6137 100644
--- a/vibrator/V1_1/build/Android.bp
+++ b/vibrator/V1_1/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.vibrator@1.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vibrator/1.1/ $(genDir)/android/hardware/vibrator/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vibrator/1.1/ $(genDir)/android/hardware/vibrator/1.1/",
     srcs: [
         ":android.hardware.vibrator@1.1_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/vibrator/1.1/Vibrator.vts.cpp",
         "android/hardware/vibrator/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.vibrator@1.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vibrator/1.1/ $(genDir)/android/hardware/vibrator/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vibrator/1.1/ $(genDir)/android/hardware/vibrator/1.1/",
     srcs: [
         ":android.hardware.vibrator@1.1_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/vibrator/1.1/Vibrator.vts.h",
         "android/hardware/vibrator/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.vibrator@1.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/vibrator/1.1/ $(genDir)/android/hardware/vibrator/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/vibrator/1.1/ $(genDir)/android/hardware/vibrator/1.1/",
     srcs: [
         ":android.hardware.vibrator@1.1_hal",
     ],
@@ -68,12 +70,13 @@
         "android/hardware/vibrator/1.1/Vibrator.vts.cpp",
         "android/hardware/vibrator/1.1/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.vibrator@1.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/vibrator/1.1/ $(genDir)/android/hardware/vibrator/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/vibrator/1.1/ $(genDir)/android/hardware/vibrator/1.1/",
     srcs: [
         ":android.hardware.vibrator@1.1_hal",
     ],
@@ -81,6 +84,7 @@
         "android/hardware/vibrator/1.1/Vibrator.vts.h",
         "android/hardware/vibrator/1.1/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/vibrator/V1_2/build/Android.bp b/vibrator/V1_2/build/Android.bp
index 8bc7f0b..3516f96 100644
--- a/vibrator/V1_2/build/Android.bp
+++ b/vibrator/V1_2/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.vibrator@1.2-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.2 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vibrator/1.2/ $(genDir)/android/hardware/vibrator/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.2 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vibrator/1.2/ $(genDir)/android/hardware/vibrator/1.2/",
     srcs: [
         ":android.hardware.vibrator@1.2_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/vibrator/1.2/Vibrator.vts.cpp",
         "android/hardware/vibrator/1.2/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.vibrator@1.2-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.2 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vibrator/1.2/ $(genDir)/android/hardware/vibrator/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.2 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vibrator/1.2/ $(genDir)/android/hardware/vibrator/1.2/",
     srcs: [
         ":android.hardware.vibrator@1.2_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/vibrator/1.2/Vibrator.vts.h",
         "android/hardware/vibrator/1.2/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -62,7 +64,7 @@
 genrule {
     name: "android.hardware.vibrator@1.2-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.2 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/vibrator/1.2/ $(genDir)/android/hardware/vibrator/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.2 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/vibrator/1.2/ $(genDir)/android/hardware/vibrator/1.2/",
     srcs: [
         ":android.hardware.vibrator@1.2_hal",
     ],
@@ -70,12 +72,13 @@
         "android/hardware/vibrator/1.2/Vibrator.vts.cpp",
         "android/hardware/vibrator/1.2/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.vibrator@1.2-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.2 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/vibrator/1.2/ $(genDir)/android/hardware/vibrator/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vibrator@1.2 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/vibrator/1.2/ $(genDir)/android/hardware/vibrator/1.2/",
     srcs: [
         ":android.hardware.vibrator@1.2_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/vibrator/1.2/Vibrator.vts.h",
         "android/hardware/vibrator/1.2/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/vr/V1_0/build/Android.bp b/vr/V1_0/build/Android.bp
index 1f6cd08..217c914 100644
--- a/vr/V1_0/build/Android.bp
+++ b/vr/V1_0/build/Android.bp
@@ -17,25 +17,27 @@
 genrule {
     name: "android.hardware.vr@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vr@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vr/1.0/ $(genDir)/android/hardware/vr/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vr@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/vr/1.0/ $(genDir)/android/hardware/vr/1.0/",
     srcs: [
         ":android.hardware.vr@1.0_hal",
     ],
     out: [
         "android/hardware/vr/1.0/Vr.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.vr@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vr@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vr/1.0/ $(genDir)/android/hardware/vr/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vr@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/vr/1.0/ $(genDir)/android/hardware/vr/1.0/",
     srcs: [
         ":android.hardware.vr@1.0_hal",
     ],
     out: [
         "android/hardware/vr/1.0/Vr.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -54,25 +56,27 @@
 genrule {
     name: "android.hardware.vr@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vr@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/vr/1.0/ $(genDir)/android/hardware/vr/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vr@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/vr/1.0/ $(genDir)/android/hardware/vr/1.0/",
     srcs: [
         ":android.hardware.vr@1.0_hal",
     ],
     out: [
         "android/hardware/vr/1.0/Vr.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.vr@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vr@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/vr/1.0/ $(genDir)/android/hardware/vr/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.vr@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/vr/1.0/ $(genDir)/android/hardware/vr/1.0/",
     srcs: [
         ":android.hardware.vr@1.0_hal",
     ],
     out: [
         "android/hardware/vr/1.0/Vr.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/weaver/V1_0/build/Android.bp b/weaver/V1_0/build/Android.bp
index 31a3721..bdc8d7e 100644
--- a/weaver/V1_0/build/Android.bp
+++ b/weaver/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.weaver@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.weaver@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/weaver/1.0/ $(genDir)/android/hardware/weaver/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.weaver@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/weaver/1.0/ $(genDir)/android/hardware/weaver/1.0/",
     srcs: [
         ":android.hardware.weaver@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/weaver/1.0/Weaver.vts.cpp",
         "android/hardware/weaver/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.weaver@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.weaver@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/weaver/1.0/ $(genDir)/android/hardware/weaver/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.weaver@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/weaver/1.0/ $(genDir)/android/hardware/weaver/1.0/",
     srcs: [
         ":android.hardware.weaver@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/weaver/1.0/Weaver.vts.h",
         "android/hardware/weaver/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -57,7 +59,7 @@
 genrule {
     name: "android.hardware.weaver@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.weaver@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/weaver/1.0/ $(genDir)/android/hardware/weaver/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.weaver@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/weaver/1.0/ $(genDir)/android/hardware/weaver/1.0/",
     srcs: [
         ":android.hardware.weaver@1.0_hal",
     ],
@@ -65,12 +67,13 @@
         "android/hardware/weaver/1.0/Weaver.vts.cpp",
         "android/hardware/weaver/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.weaver@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.weaver@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/weaver/1.0/ $(genDir)/android/hardware/weaver/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.weaver@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/weaver/1.0/ $(genDir)/android/hardware/weaver/1.0/",
     srcs: [
         ":android.hardware.weaver@1.0_hal",
     ],
@@ -78,6 +81,7 @@
         "android/hardware/weaver/1.0/Weaver.vts.h",
         "android/hardware/weaver/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/wifi/V1_0/build/Android.bp b/wifi/V1_0/build/Android.bp
index 60e7ba4..a21e418 100644
--- a/wifi/V1_0/build/Android.bp
+++ b/wifi/V1_0/build/Android.bp
@@ -30,7 +30,7 @@
 genrule {
     name: "android.hardware.wifi@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/",
     srcs: [
         ":android.hardware.wifi@1.0_hal",
     ],
@@ -50,12 +50,13 @@
         "android/hardware/wifi/1.0/WifiStaIfaceEventCallback.vts.cpp",
         "android/hardware/wifi/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.wifi@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/",
     srcs: [
         ":android.hardware.wifi@1.0_hal",
     ],
@@ -75,6 +76,7 @@
         "android/hardware/wifi/1.0/WifiStaIfaceEventCallback.vts.h",
         "android/hardware/wifi/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -93,7 +95,7 @@
 genrule {
     name: "android.hardware.wifi@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/",
     srcs: [
         ":android.hardware.wifi@1.0_hal",
     ],
@@ -113,12 +115,13 @@
         "android/hardware/wifi/1.0/WifiStaIfaceEventCallback.vts.cpp",
         "android/hardware/wifi/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.wifi@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/wifi/1.0/ $(genDir)/android/hardware/wifi/1.0/",
     srcs: [
         ":android.hardware.wifi@1.0_hal",
     ],
@@ -138,6 +141,7 @@
         "android/hardware/wifi/1.0/WifiStaIfaceEventCallback.vts.h",
         "android/hardware/wifi/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/wifi/V1_1/build/Android.bp b/wifi/V1_1/build/Android.bp
index be1d9eb..cac4413 100644
--- a/wifi/V1_1/build/Android.bp
+++ b/wifi/V1_1/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.wifi@1.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/wifi/1.1/ $(genDir)/android/hardware/wifi/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/wifi/1.1/ $(genDir)/android/hardware/wifi/1.1/",
     srcs: [
         ":android.hardware.wifi@1.1_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/wifi/1.1/Wifi.vts.cpp",
         "android/hardware/wifi/1.1/WifiChip.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.wifi@1.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/wifi/1.1/ $(genDir)/android/hardware/wifi/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/wifi/1.1/ $(genDir)/android/hardware/wifi/1.1/",
     srcs: [
         ":android.hardware.wifi@1.1_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/wifi/1.1/Wifi.vts.h",
         "android/hardware/wifi/1.1/WifiChip.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.wifi@1.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/wifi/1.1/ $(genDir)/android/hardware/wifi/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/wifi/1.1/ $(genDir)/android/hardware/wifi/1.1/",
     srcs: [
         ":android.hardware.wifi@1.1_hal",
     ],
@@ -68,12 +70,13 @@
         "android/hardware/wifi/1.1/Wifi.vts.cpp",
         "android/hardware/wifi/1.1/WifiChip.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.wifi@1.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/wifi/1.1/ $(genDir)/android/hardware/wifi/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/wifi/1.1/ $(genDir)/android/hardware/wifi/1.1/",
     srcs: [
         ":android.hardware.wifi@1.1_hal",
     ],
@@ -81,6 +84,7 @@
         "android/hardware/wifi/1.1/Wifi.vts.h",
         "android/hardware/wifi/1.1/WifiChip.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/wifi/V1_2/build/Android.bp b/wifi/V1_2/build/Android.bp
index ca1b596..60d08d7 100644
--- a/wifi/V1_2/build/Android.bp
+++ b/wifi/V1_2/build/Android.bp
@@ -23,7 +23,7 @@
 genrule {
     name: "android.hardware.wifi@1.2-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.2 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/wifi/1.2/ $(genDir)/android/hardware/wifi/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.2 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/wifi/1.2/ $(genDir)/android/hardware/wifi/1.2/",
     srcs: [
         ":android.hardware.wifi@1.2_hal",
     ],
@@ -36,12 +36,13 @@
         "android/hardware/wifi/1.2/WifiStaIface.vts.cpp",
         "android/hardware/wifi/1.2/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.wifi@1.2-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.2 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/wifi/1.2/ $(genDir)/android/hardware/wifi/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.2 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/wifi/1.2/ $(genDir)/android/hardware/wifi/1.2/",
     srcs: [
         ":android.hardware.wifi@1.2_hal",
     ],
@@ -54,6 +55,7 @@
         "android/hardware/wifi/1.2/WifiStaIface.vts.h",
         "android/hardware/wifi/1.2/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -77,7 +79,7 @@
 genrule {
     name: "android.hardware.wifi@1.2-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.2 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/wifi/1.2/ $(genDir)/android/hardware/wifi/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.2 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/wifi/1.2/ $(genDir)/android/hardware/wifi/1.2/",
     srcs: [
         ":android.hardware.wifi@1.2_hal",
     ],
@@ -90,12 +92,13 @@
         "android/hardware/wifi/1.2/WifiStaIface.vts.cpp",
         "android/hardware/wifi/1.2/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.wifi@1.2-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.2 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/wifi/1.2/ $(genDir)/android/hardware/wifi/1.2/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi@1.2 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/wifi/1.2/ $(genDir)/android/hardware/wifi/1.2/",
     srcs: [
         ":android.hardware.wifi@1.2_hal",
     ],
@@ -108,6 +111,7 @@
         "android/hardware/wifi/1.2/WifiStaIface.vts.h",
         "android/hardware/wifi/1.2/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/wifi/hostapd/V1_0/build/Android.bp b/wifi/hostapd/V1_0/build/Android.bp
index 5ca6a42..9ec2c48 100644
--- a/wifi/hostapd/V1_0/build/Android.bp
+++ b/wifi/hostapd/V1_0/build/Android.bp
@@ -18,7 +18,7 @@
 genrule {
     name: "android.hardware.wifi.hostapd@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.hostapd@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/wifi/hostapd/1.0/ $(genDir)/android/hardware/wifi/hostapd/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.hostapd@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/wifi/hostapd/1.0/ $(genDir)/android/hardware/wifi/hostapd/1.0/",
     srcs: [
         ":android.hardware.wifi.hostapd@1.0_hal",
     ],
@@ -26,12 +26,13 @@
         "android/hardware/wifi/hostapd/1.0/Hostapd.vts.cpp",
         "android/hardware/wifi/hostapd/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.wifi.hostapd@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.hostapd@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/wifi/hostapd/1.0/ $(genDir)/android/hardware/wifi/hostapd/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.hostapd@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/wifi/hostapd/1.0/ $(genDir)/android/hardware/wifi/hostapd/1.0/",
     srcs: [
         ":android.hardware.wifi.hostapd@1.0_hal",
     ],
@@ -39,6 +40,7 @@
         "android/hardware/wifi/hostapd/1.0/Hostapd.vts.h",
         "android/hardware/wifi/hostapd/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.wifi.hostapd@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.hostapd@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/wifi/hostapd/1.0/ $(genDir)/android/hardware/wifi/hostapd/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.hostapd@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/wifi/hostapd/1.0/ $(genDir)/android/hardware/wifi/hostapd/1.0/",
     srcs: [
         ":android.hardware.wifi.hostapd@1.0_hal",
     ],
@@ -68,12 +70,13 @@
         "android/hardware/wifi/hostapd/1.0/Hostapd.vts.cpp",
         "android/hardware/wifi/hostapd/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.wifi.hostapd@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.hostapd@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/wifi/hostapd/1.0/ $(genDir)/android/hardware/wifi/hostapd/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.hostapd@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/wifi/hostapd/1.0/ $(genDir)/android/hardware/wifi/hostapd/1.0/",
     srcs: [
         ":android.hardware.wifi.hostapd@1.0_hal",
     ],
@@ -81,6 +84,7 @@
         "android/hardware/wifi/hostapd/1.0/Hostapd.vts.h",
         "android/hardware/wifi/hostapd/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/wifi/offload/V1_0/build/Android.bp b/wifi/offload/V1_0/build/Android.bp
index 4484eaf..d237518 100644
--- a/wifi/offload/V1_0/build/Android.bp
+++ b/wifi/offload/V1_0/build/Android.bp
@@ -19,7 +19,7 @@
 genrule {
     name: "android.hardware.wifi.offload@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.offload@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/wifi/offload/1.0/ $(genDir)/android/hardware/wifi/offload/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.offload@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/wifi/offload/1.0/ $(genDir)/android/hardware/wifi/offload/1.0/",
     srcs: [
         ":android.hardware.wifi.offload@1.0_hal",
     ],
@@ -28,12 +28,13 @@
         "android/hardware/wifi/offload/1.0/OffloadCallback.vts.cpp",
         "android/hardware/wifi/offload/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.wifi.offload@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.offload@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/wifi/offload/1.0/ $(genDir)/android/hardware/wifi/offload/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.offload@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/wifi/offload/1.0/ $(genDir)/android/hardware/wifi/offload/1.0/",
     srcs: [
         ":android.hardware.wifi.offload@1.0_hal",
     ],
@@ -42,6 +43,7 @@
         "android/hardware/wifi/offload/1.0/OffloadCallback.vts.h",
         "android/hardware/wifi/offload/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -60,7 +62,7 @@
 genrule {
     name: "android.hardware.wifi.offload@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.offload@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/wifi/offload/1.0/ $(genDir)/android/hardware/wifi/offload/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.offload@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/wifi/offload/1.0/ $(genDir)/android/hardware/wifi/offload/1.0/",
     srcs: [
         ":android.hardware.wifi.offload@1.0_hal",
     ],
@@ -69,12 +71,13 @@
         "android/hardware/wifi/offload/1.0/OffloadCallback.vts.cpp",
         "android/hardware/wifi/offload/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.wifi.offload@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.offload@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/wifi/offload/1.0/ $(genDir)/android/hardware/wifi/offload/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.offload@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/wifi/offload/1.0/ $(genDir)/android/hardware/wifi/offload/1.0/",
     srcs: [
         ":android.hardware.wifi.offload@1.0_hal",
     ],
@@ -83,6 +86,7 @@
         "android/hardware/wifi/offload/1.0/OffloadCallback.vts.h",
         "android/hardware/wifi/offload/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/wifi/supplicant/V1_0/build/Android.bp b/wifi/supplicant/V1_0/build/Android.bp
index d28c94d..cd315b4 100644
--- a/wifi/supplicant/V1_0/build/Android.bp
+++ b/wifi/supplicant/V1_0/build/Android.bp
@@ -29,7 +29,7 @@
 genrule {
     name: "android.hardware.wifi.supplicant@1.0-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/",
     srcs: [
         ":android.hardware.wifi.supplicant@1.0_hal",
     ],
@@ -48,12 +48,13 @@
         "android/hardware/wifi/supplicant/1.0/SupplicantStaNetworkCallback.vts.cpp",
         "android/hardware/wifi/supplicant/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.wifi.supplicant@1.0-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/",
     srcs: [
         ":android.hardware.wifi.supplicant@1.0_hal",
     ],
@@ -72,6 +73,7 @@
         "android/hardware/wifi/supplicant/1.0/SupplicantStaNetworkCallback.vts.h",
         "android/hardware/wifi/supplicant/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -90,7 +92,7 @@
 genrule {
     name: "android.hardware.wifi.supplicant@1.0-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/",
     srcs: [
         ":android.hardware.wifi.supplicant@1.0_hal",
     ],
@@ -109,12 +111,13 @@
         "android/hardware/wifi/supplicant/1.0/SupplicantStaNetworkCallback.vts.cpp",
         "android/hardware/wifi/supplicant/1.0/types.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.wifi.supplicant@1.0-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/wifi/supplicant/1.0/ $(genDir)/android/hardware/wifi/supplicant/1.0/",
     srcs: [
         ":android.hardware.wifi.supplicant@1.0_hal",
     ],
@@ -133,6 +136,7 @@
         "android/hardware/wifi/supplicant/1.0/SupplicantStaNetworkCallback.vts.h",
         "android/hardware/wifi/supplicant/1.0/types.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
diff --git a/wifi/supplicant/V1_1/build/Android.bp b/wifi/supplicant/V1_1/build/Android.bp
index 1729f79..978c72f 100644
--- a/wifi/supplicant/V1_1/build/Android.bp
+++ b/wifi/supplicant/V1_1/build/Android.bp
@@ -20,7 +20,7 @@
 genrule {
     name: "android.hardware.wifi.supplicant@1.1-vts.driver_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/wifi/supplicant/1.1/ $(genDir)/android/hardware/wifi/supplicant/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.1 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/wifi/supplicant/1.1/ $(genDir)/android/hardware/wifi/supplicant/1.1/",
     srcs: [
         ":android.hardware.wifi.supplicant@1.1_hal",
     ],
@@ -30,12 +30,13 @@
         "android/hardware/wifi/supplicant/1.1/SupplicantStaIfaceCallback.vts.cpp",
         "android/hardware/wifi/supplicant/1.1/SupplicantStaNetwork.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.wifi.supplicant@1.1-vts.driver_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/wifi/supplicant/1.1/ $(genDir)/android/hardware/wifi/supplicant/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.1 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/wifi/supplicant/1.1/ $(genDir)/android/hardware/wifi/supplicant/1.1/",
     srcs: [
         ":android.hardware.wifi.supplicant@1.1_hal",
     ],
@@ -45,6 +46,7 @@
         "android/hardware/wifi/supplicant/1.1/SupplicantStaIfaceCallback.vts.h",
         "android/hardware/wifi/supplicant/1.1/SupplicantStaNetwork.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {
@@ -66,7 +68,7 @@
 genrule {
     name: "android.hardware.wifi.supplicant@1.1-vts.profiler_genc++",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/wifi/supplicant/1.1/ $(genDir)/android/hardware/wifi/supplicant/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.1 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/wifi/supplicant/1.1/ $(genDir)/android/hardware/wifi/supplicant/1.1/",
     srcs: [
         ":android.hardware.wifi.supplicant@1.1_hal",
     ],
@@ -76,12 +78,13 @@
         "android/hardware/wifi/supplicant/1.1/SupplicantStaIfaceCallback.vts.cpp",
         "android/hardware/wifi/supplicant/1.1/SupplicantStaNetwork.vts.cpp",
     ],
+    depfile: true,
 }
 
 genrule {
     name: "android.hardware.wifi.supplicant@1.1-vts.profiler_genc++_headers",
     tools: ["hidl-gen", "vtsc"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/wifi/supplicant/1.1/ $(genDir)/android/hardware/wifi/supplicant/1.1/",
+    cmd: "$(location hidl-gen) -d $(depfile) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.wifi.supplicant@1.1 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/wifi/supplicant/1.1/ $(genDir)/android/hardware/wifi/supplicant/1.1/",
     srcs: [
         ":android.hardware.wifi.supplicant@1.1_hal",
     ],
@@ -91,6 +94,7 @@
         "android/hardware/wifi/supplicant/1.1/SupplicantStaIfaceCallback.vts.h",
         "android/hardware/wifi/supplicant/1.1/SupplicantStaNetwork.vts.h",
     ],
+    depfile: true,
 }
 
 cc_library_shared {