p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Separate aidl dependencies from compiler dependencies" am: 8edda3afdf 

am: cfd817d058

* commit 'cfd817d058994ebda3b98db4e8113752753d422e':
  Separate aidl dependencies from compiler dependencies
This commit is contained in:
Christopher Wiley 2016-01-21 18:29:25 +00:00 committed by android-build-merger
parent d1eea90a72 cfd817d058
commit e46193a608
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/binary.mk
View File

@ -743,7 +743,13 @@ aidl_gen_include_root := $(intermediates)/aidl-generated/include
# Thus we'll actually generate source for each architecture. # Thus we'll actually generate source for each architecture.
$(foreach s,$(aidl_src),\ $(foreach s,$(aidl_src),\
$(eval $(call define-aidl-cpp-rule,$(s),$(aidl_gen_cpp_root),aidl_gen_cpp))) $(eval $(call define-aidl-cpp-rule,$(s),$(aidl_gen_cpp_root),aidl_gen_cpp)))
-include $(addsuffix .P,$(basename $(aidl_gen_cpp))) ifeq ($(BUILDING_WITH_NINJA),true)
$(foreach cpp,$(aidl_gen_cpp), \
$(eval $(cpp) : .KATI_DEPFILE := $(addsuffix .aidl.P,$(basename $(cpp)))))
else
-include $(addsuffix .aidl.P,$(basename $(aidl_gen_cpp)))
endif
$(aidl_gen_cpp) : PRIVATE_MODULE := $(LOCAL_MODULE) $(aidl_gen_cpp) : PRIVATE_MODULE := $(LOCAL_MODULE)
$(aidl_gen_cpp) : PRIVATE_HEADER_OUTPUT_DIR := $(aidl_gen_include_root) $(aidl_gen_cpp) : PRIVATE_HEADER_OUTPUT_DIR := $(aidl_gen_include_root)

2
core/definitions.mk
View File

@ -971,7 +971,7 @@ define transform-aidl-to-cpp
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@mkdir -p $(PRIVATE_HEADER_OUTPUT_DIR) @mkdir -p $(PRIVATE_HEADER_OUTPUT_DIR)
@echo "Generating C++ from AIDL: $(PRIVATE_MODULE) <= $<" @echo "Generating C++ from AIDL: $(PRIVATE_MODULE) <= $<"
$(hide) $(AIDL_CPP) -d$(basename $@).P $(PRIVATE_AIDL_FLAGS) \ $(hide) $(AIDL_CPP) -d$(basename $@).aidl.P $(PRIVATE_AIDL_FLAGS) \
$< $(PRIVATE_HEADER_OUTPUT_DIR) $@ $< $(PRIVATE_HEADER_OUTPUT_DIR) $@
endef endef