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

Commit 8edda3af authored by Christopher Wiley's avatar Christopher Wiley Committed by Gerrit Code Review
Browse files

Merge "Separate aidl dependencies from compiler dependencies"

parents 11feb8b0 087f3273

core/binary.mk

+7 −1
Original line number Diff line number Diff line
@@ -741,7 +741,13 @@ aidl_gen_include_root := $(intermediates)/aidl-generated/include 
# Thus we'll actually generate source for each architecture.

$(foreach s,$(aidl_src),\

    $(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_HEADER_OUTPUT_DIR := $(aidl_gen_include_root)

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -989,7 +989,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 $@).P $(PRIVATE_AIDL_FLAGS) \

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

    $< $(PRIVATE_HEADER_OUTPUT_DIR) $@

endef