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

Commit 7d4c926e authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Use new -ninja flag to aidl-cpp"

parents da85feca fb842813

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -953,7 +953,7 @@ aidl_gen_include_root := $(intermediates)/aidl-generated/include 
$(foreach s,$(aidl_src),\

    $(eval $(call define-aidl-cpp-rule,$(s),$(aidl_gen_cpp_root),aidl_gen_cpp)))

$(foreach cpp,$(aidl_gen_cpp), \

    $(call include-depfile,$(addsuffix .aidl.P,$(basename $(cpp))),$(cpp)))

    $(call include-depfile,$(addsuffix .aidl.d,$(basename $(cpp))),$(cpp)))

$(call track-src-file-gen,$(aidl_src),$(aidl_gen_cpp))



$(aidl_gen_cpp) : PRIVATE_MODULE := $(LOCAL_MODULE)

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -1063,7 +1063,7 @@ define transform-aidl-to-cpp 
@mkdir -p $(dir $@)

@mkdir -p $(PRIVATE_HEADER_OUTPUT_DIR)

@echo "Generating C++ from AIDL: $(PRIVATE_MODULE) <= $<"

$(hide) $(AIDL_CPP) -d$(basename $@).aidl.P $(PRIVATE_AIDL_FLAGS) \

$(hide) $(AIDL_CPP) -d$(basename $@).aidl.d -ninja $(PRIVATE_AIDL_FLAGS) \

    $< $(PRIVATE_HEADER_OUTPUT_DIR) $@

endef