Merge "Stop trying to read depfile from vtsc"
This commit is contained in:
@@ -913,8 +913,6 @@ vts_gen_include_root := $(intermediates)/vts-generated/include
|
|||||||
# Thus we'll actually generate source for each architecture.
|
# Thus we'll actually generate source for each architecture.
|
||||||
$(foreach s,$(vts_src),\
|
$(foreach s,$(vts_src),\
|
||||||
$(eval $(call define-vts-cpp-rule,$(s),$(vts_gen_cpp_root),vts_gen_cpp)))
|
$(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))
|
$(call track-src-file-gen,$(vts_src),$(vts_gen_cpp))
|
||||||
|
|
||||||
$(vts_gen_cpp) : PRIVATE_MODULE := $(LOCAL_MODULE)
|
$(vts_gen_cpp) : PRIVATE_MODULE := $(LOCAL_MODULE)
|
||||||
|
@@ -1023,7 +1023,7 @@ define transform-vts-to-cpp
|
|||||||
@mkdir -p $(dir $@)
|
@mkdir -p $(dir $@)
|
||||||
@mkdir -p $(PRIVATE_HEADER_OUTPUT_DIR)
|
@mkdir -p $(PRIVATE_HEADER_OUTPUT_DIR)
|
||||||
@echo "Generating C++ from VTS: $(PRIVATE_MODULE) <= $<"
|
@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) $@
|
$< $(PRIVATE_HEADER_OUTPUT_DIR) $@
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user