Merge "update makefile rule to package test modules as part of VTS"
diff --git a/main.cpp b/main.cpp
index d691916..59a842e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -207,6 +207,12 @@
     out << "\n";
     out.unindent();
 
+    if (path.find("hardware/interfaces/tests/") != std::string::npos) {
+        out << "\nLOCAL_COMPATIBILITY_SUITE := vts"
+            << "\n-include test/vts/tools/build/Android.packaging_sharedlib.mk";
+        // TODO(yim): b/30589200 remove the above -include line after the
+        // build rule change is merged.
+    }
     out << "\ninclude $(BUILD_SHARED_LIBRARY)\n";
 
     return OK;