Merge "Stop trying to read depfile from vtsc"

am: 82f2cb078f

Change-Id: If3d91df0198cb68dc7e63ac0c0e978473ac6d4a5
This commit is contained in:
Dan Willemsen 2019-01-10 10:01:57 -08:00 committed by android-build-merger
commit d372e54742
2 changed files with 1 additions and 3 deletions

View file

@ -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)

View file

@ -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