aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen2019-01-09 14:48:17 -0600
committerDan Willemsen2019-01-09 18:40:58 -0600
commit5125746561c89b6156f876124792c9f915d7f9ea (patch)
tree284b36cbd9c2236b0632f7cfa2300bf8df494e58
parent9ce12752dc6f0fccce3c7e07d3cba9f9491e9212 (diff)
downloadplatform-build-5125746561c89b6156f876124792c9f915d7f9ea.tar.gz
platform-build-5125746561c89b6156f876124792c9f915d7f9ea.tar.xz
platform-build-5125746561c89b6156f876124792c9f915d7f9ea.zip
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
-rw-r--r--core/binary.mk2
-rw-r--r--core/definitions.mk2
2 files changed, 1 insertions, 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
913# Thus we'll actually generate source for each architecture. 913# Thus we'll actually generate source for each architecture.
914$(foreach s,$(vts_src),\ 914$(foreach s,$(vts_src),\
915 $(eval $(call define-vts-cpp-rule,$(s),$(vts_gen_cpp_root),vts_gen_cpp))) 915 $(eval $(call define-vts-cpp-rule,$(s),$(vts_gen_cpp_root),vts_gen_cpp)))
916$(foreach cpp,$(vts_gen_cpp), \
917 $(call include-depfile,$(addsuffix .vts.P,$(basename $(cpp))),$(cpp)))
918$(call track-src-file-gen,$(vts_src),$(vts_gen_cpp)) 916$(call track-src-file-gen,$(vts_src),$(vts_gen_cpp))
919 917
920$(vts_gen_cpp) : PRIVATE_MODULE := $(LOCAL_MODULE) 918$(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
1023@mkdir -p $(dir $@) 1023@mkdir -p $(dir $@)
1024@mkdir -p $(PRIVATE_HEADER_OUTPUT_DIR) 1024@mkdir -p $(PRIVATE_HEADER_OUTPUT_DIR)
1025@echo "Generating C++ from VTS: $(PRIVATE_MODULE) <= $<" 1025@echo "Generating C++ from VTS: $(PRIVATE_MODULE) <= $<"
1026$(hide) $(VTSC) -d$(basename $@).vts.P $(PRIVATE_VTS_FLAGS) \ 1026$(hide) $(VTSC) -TODO_b/120496070 $(PRIVATE_VTS_FLAGS) \
1027 $< $(PRIVATE_HEADER_OUTPUT_DIR) $@ 1027 $< $(PRIVATE_HEADER_OUTPUT_DIR) $@
1028endef 1028endef
1029 1029