From 5125746561c89b6156f876124792c9f915d7f9ea Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Wed, 9 Jan 2019 12:48:17 -0800
Subject: [PATCH] Stop trying to read depfile from vtsc

vtsc just ignores the -d argument and apparently can't write a depfile.
So for now, just stop assuming it produces one.

Bug: 121058584
Bug: 120496070
Test: NINJA_ARGS="-w missingdepfile=err" m libvts_interfacespecification
Change-Id: Ie1483fbeead9f710d8a6636df07ce44bbc4a6e2d
---
 core/binary.mk      | 2 --
 core/definitions.mk | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/binary.mk b/core/binary.mk
index c3878f96c..e7b0c52d6 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -913,8 +913,6 @@ vts_gen_include_root := $(intermediates)/vts-generated/include
 # Thus we'll actually generate source for each architecture.
 $(foreach s,$(vts_src),\
     $(eval $(call define-vts-cpp-rule,$(s),$(vts_gen_cpp_root),vts_gen_cpp)))
-$(foreach cpp,$(vts_gen_cpp), \
-    $(call include-depfile,$(addsuffix .vts.P,$(basename $(cpp))),$(cpp)))
 $(call track-src-file-gen,$(vts_src),$(vts_gen_cpp))
 
 $(vts_gen_cpp) : PRIVATE_MODULE := $(LOCAL_MODULE)
diff --git a/core/definitions.mk b/core/definitions.mk
index a67508018..a9807f110 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1023,7 +1023,7 @@ define transform-vts-to-cpp
 @mkdir -p $(dir $@)
 @mkdir -p $(PRIVATE_HEADER_OUTPUT_DIR)
 @echo "Generating C++ from VTS: $(PRIVATE_MODULE) <= $<"
-$(hide) $(VTSC) -d$(basename $@).vts.P $(PRIVATE_VTS_FLAGS) \
+$(hide) $(VTSC) -TODO_b/120496070 $(PRIVATE_VTS_FLAGS) \
     $< $(PRIVATE_HEADER_OUTPUT_DIR) $@
 endef