Merge "Disable hidl_gen_test."
diff --git a/test/Android.mk b/test/Android.mk
index e0363fe..4b57fae 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -27,6 +27,9 @@
 
 include $(BUILD_EXECUTABLE)
 
+ENABLE_HIDL_GEN_TEST := false
+
+ifeq ($(ENABLE_HIDL_GEN_TEST),true)
 # build for hidl_gen_test which verify hidl_gen generates expected output codes.
 include $(CLEAR_VARS)
 LOCAL_MODULE := hidl_gen_test
@@ -45,5 +48,6 @@
 	@echo "host Test: $(PRIVATE_MODULE)"
 	$(hide) python $(PRIVATE_PY_SCRIPT) $(PRIVATE_HIDL_EXEC) $(PRIVATE_CANONICAL_DIR) $(PRIVATE_OUT_DIR) $(PRIVATE_PACKAGE_ROOT)
 	$(hide) touch $@
+endif
 
 include $(call all-makefiles-under,$(LOCAL_PATH))