aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2019-01-10 11:46:34 -0600
committerGerrit Code Review2019-01-10 11:46:34 -0600
commit82f2cb078fd7cdbe144eb71d653d88d62bfdd37f (patch)
tree6085c488704008786cc36d3f1a175aca25653673
parentc64bc3229ae110936e1020ba187c28d2d93e83f7 (diff)
parent5125746561c89b6156f876124792c9f915d7f9ea (diff)
downloadplatform-build-82f2cb078fd7cdbe144eb71d653d88d62bfdd37f.tar.gz
platform-build-82f2cb078fd7cdbe144eb71d653d88d62bfdd37f.tar.xz
platform-build-82f2cb078fd7cdbe144eb71d653d88d62bfdd37f.zip
Merge "Stop trying to read depfile from vtsc"
-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