Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51257465 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

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
parent 9ce12752

core/binary.mk

+0 −2
Original line number Diff line number Diff line
@@ -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)

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -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