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

Commit 491ae5b2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I2183ac9f,I2c76701c,Ibbe4e11a,I0706faa2,Ic5b7c4fb, ... 

* changes:
  Fix dependency on BOARD_AVB_SYSTEM_KEY_PATH
  Fix some java library dependencies
  Depend on NDK libraries
  Call clean-path in more places
  Add missing dependecy on SOONG_ZIP
  Add dependencies on the toolchain (clang, etc)
parents b7035aef 6b72c73a

core/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -2258,6 +2258,9 @@ define build-systemimage-target 
           exit 1 )

endef



ifeq ($(BOARD_AVB_ENABLE),true)

$(BUILT_SYSTEMIMAGE): $(BOARD_AVB_SYSTEM_KEY_PATH)

endif

$(BUILT_SYSTEMIMAGE): $(FULL_SYSTEMIMAGE_DEPS) $(INSTALLED_FILES_FILE) $(BUILD_IMAGE_SRCS)

	$(call build-systemimage-target,$@)

core/base_rules.mk

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ endif 
logtags_sources := $(filter %.logtags,$(LOCAL_SRC_FILES)) $(LOCAL_LOGTAGS_FILES)



ifneq ($(strip $(logtags_sources)),)

event_log_tags := $(addprefix $(LOCAL_PATH)/,$(logtags_sources))

event_log_tags := $(foreach f,$(addprefix $(LOCAL_PATH)/,$(logtags_sources)),$(call clean-path,$(f)))

else

event_log_tags :=

endif

core/binary.mk

+15 −11
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ $(dotdot_objects) $(cpp_objects): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags) 
ifneq ($(strip $(cpp_objects)),)

$(cpp_objects): $(intermediates)/%.o: \

    $(TOPDIR)$(LOCAL_PATH)/%$(LOCAL_CPP_EXTENSION) \

    $(my_additional_dependencies)

    $(my_additional_dependencies) $(CLANG_CXX)

	$(transform-$(PRIVATE_HOST)cpp-to-o)

$(call include-depfiles-for-objs, $(cpp_objects))

endif
@@ -897,7 +897,7 @@ $(gen_cpp_objects): PRIVATE_ARM_MODE := $(normal_objects_mode) 
$(gen_cpp_objects): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags)

$(gen_cpp_objects): $(intermediates)/%.o: \

    $(intermediates)/%$(LOCAL_CPP_EXTENSION) \

    $(my_additional_dependencies)

    $(my_additional_dependencies) $(CLANG_CXX)

	$(transform-$(PRIVATE_HOST)cpp-to-o)

$(call include-depfiles-for-objs, $(gen_cpp_objects))

endif
@@ -912,7 +912,7 @@ $(call track-gen-file-obj,$(gen_S_sources),$(gen_S_objects)) 


ifneq ($(strip $(gen_S_sources)),)

$(gen_S_objects): $(intermediates)/%.o: $(intermediates)/%.S \

    $(my_additional_dependencies)

    $(my_additional_dependencies) $(CLANG)

	$(transform-$(PRIVATE_HOST)s-to-o)

$(call include-depfiles-for-objs, $(gen_S_objects))

endif
@@ -923,7 +923,7 @@ $(call track-gen-file-obj,$(gen_s_sources),$(gen_s_objects)) 


ifneq ($(strip $(gen_s_objects)),)

$(gen_s_objects): $(intermediates)/%.o: $(intermediates)/%.s \

    $(my_additional_dependencies)

    $(my_additional_dependencies) $(CLANG)

	$(transform-$(PRIVATE_HOST)s-to-o)

endif
@@ -961,7 +961,7 @@ $(dotdot_objects) $(c_objects): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags) 


ifneq ($(strip $(c_objects)),)

$(c_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.c \

    $(my_additional_dependencies)

    $(my_additional_dependencies) $(CLANG)

	$(transform-$(PRIVATE_HOST)c-to-o)

$(call include-depfiles-for-objs, $(c_objects))

endif
@@ -981,7 +981,7 @@ ifneq ($(strip $(gen_c_objects)),) 
$(gen_c_objects): PRIVATE_ARM_MODE := $(normal_objects_mode)

$(gen_c_objects): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags)

$(gen_c_objects): $(intermediates)/%.o: $(intermediates)/%.c \

    $(my_additional_dependencies)

    $(my_additional_dependencies) $(CLANG)

	$(transform-$(PRIVATE_HOST)c-to-o)

$(call include-depfiles-for-objs, $(gen_c_objects))

endif
@@ -997,7 +997,7 @@ $(call track-src-file-obj,$(objc_sources),$(objc_objects)) 
ifneq ($(strip $(objc_objects)),)

my_soong_problems += objc

$(objc_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.m \

    $(my_additional_dependencies)

    $(my_additional_dependencies) $(CLANG)

	$(transform-$(PRIVATE_HOST)m-to-o)

$(call include-depfiles-for-objs, $(objc_objects))

endif
@@ -1012,7 +1012,7 @@ $(call track-src-file-obj,$(objcpp_sources),$(objcpp_objects)) 


ifneq ($(strip $(objcpp_objects)),)

$(objcpp_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.mm \

    $(my_additional_dependencies)

    $(my_additional_dependencies) $(CLANG_CXX)

	$(transform-$(PRIVATE_HOST)mm-to-o)

$(call include-depfiles-for-objs, $(objcpp_objects))

endif
@@ -1036,7 +1036,7 @@ $(call track-src-file-obj,$(dotdot_sources),$(dotdot_objects_S)) 


ifneq ($(strip $(asm_objects_S)),)

$(asm_objects_S): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.S \

    $(my_additional_dependencies)

    $(my_additional_dependencies) $(CLANG)

	$(transform-$(PRIVATE_HOST)s-to-o)

$(call include-depfiles-for-objs, $(asm_objects_S))

endif
@@ -1056,7 +1056,7 @@ $(call track-src-file-obj,$(dotdot_sources),$(dotdot_objects_s)) 


ifneq ($(strip $(asm_objects_s)),)

$(asm_objects_s): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.s \

    $(my_additional_dependencies)

    $(my_additional_dependencies) $(CLANG)

	$(transform-$(PRIVATE_HOST)s-to-o)

endif
@@ -1069,7 +1069,7 @@ asm_sources_asm := $(filter %.asm,$(my_src_files)) 
ifneq ($(strip $(asm_sources_asm)),)

asm_objects_asm := $(addprefix $(intermediates)/,$(asm_sources_asm:.asm=.o))

$(asm_objects_asm): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.asm \

    $(my_additional_dependencies)

    $(my_additional_dependencies) $(YASM)

	$(transform-asm-to-o)

$(call track-src-file-obj,$(asm_sources_asm),$(asm_objects_asm))
@@ -1362,6 +1362,10 @@ built_shared_libraries += \ 
    $(my_ndk_shared_libraries_fullpath) \

    $(my_system_shared_libraries_fullpath) \



built_shared_library_deps += \

    $(my_ndk_shared_libraries_fullpath) \

    $(my_system_shared_libraries_fullpath) \



else

built_shared_libraries := \

    $(foreach lib,$(installed_shared_library_module_names), \

core/definitions.mk

+7 −7
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ endef 
# You must call this with $(eval).

define define-aidl-java-rule

define-aidl-java-rule-src := $(patsubst %.aidl,%.java,$(subst ../,dotdot/,$(addprefix $(2)/,$(1))))

$$(define-aidl-java-rule-src) : $(LOCAL_PATH)/$(1) $(AIDL)

$$(define-aidl-java-rule-src) : $(call clean-path,$(LOCAL_PATH)/$(1)) $(AIDL)

	$$(transform-aidl-to-java)

$(3) += $$(define-aidl-java-rule-src)

endef
@@ -1025,7 +1025,7 @@ endef 
# You must call this with $(eval).

define define-aidl-cpp-rule

define-aidl-cpp-rule-src := $(patsubst %.aidl,%$(LOCAL_CPP_EXTENSION),$(subst ../,dotdot/,$(addprefix $(2)/,$(1))))

$$(define-aidl-cpp-rule-src) : $(LOCAL_PATH)/$(1) $(AIDL_CPP)

$$(define-aidl-cpp-rule-src) : $(call clean-path,$(LOCAL_PATH)/$(1)) $(AIDL_CPP)

	$$(transform-aidl-to-cpp)

$(3) += $$(define-aidl-cpp-rule-src)

endef
@@ -1365,7 +1365,7 @@ DOTDOT_REPLACEMENT := dotdot/ 
# $(3): the variable name to collect the output object file.

define compile-dotdot-cpp-file

o := $(intermediates)/$(patsubst %$(LOCAL_CPP_EXTENSION),%.o,$(subst ../,$(DOTDOT_REPLACEMENT),$(1)))

$$(o) : $(TOPDIR)$(LOCAL_PATH)/$(1) $(2)

$$(o) : $(TOPDIR)$(LOCAL_PATH)/$(1) $(2) $(CLANG_CXX)

	$$(transform-$$(PRIVATE_HOST)cpp-to-o)

$$(call include-depfiles-for-objs, $$(o))

$(3) += $$(o)
@@ -1378,7 +1378,7 @@ endef 
# $(3): the variable name to collect the output object file.

define compile-dotdot-c-file

o := $(intermediates)/$(patsubst %.c,%.o,$(subst ../,$(DOTDOT_REPLACEMENT),$(1)))

$$(o) : $(TOPDIR)$(LOCAL_PATH)/$(1) $(2)

$$(o) : $(TOPDIR)$(LOCAL_PATH)/$(1) $(2) $(CLANG)

	$$(transform-$$(PRIVATE_HOST)c-to-o)

$$(call include-depfiles-for-objs, $$(o))

$(3) += $$(o)
@@ -1391,7 +1391,7 @@ endef 
# $(3): the variable name to collect the output object file.

define compile-dotdot-s-file

o := $(intermediates)/$(patsubst %.S,%.o,$(subst ../,$(DOTDOT_REPLACEMENT),$(1)))

$$(o) : $(TOPDIR)$(LOCAL_PATH)/$(1) $(2)

$$(o) : $(TOPDIR)$(LOCAL_PATH)/$(1) $(2) $(CLANG)

	$$(transform-$$(PRIVATE_HOST)s-to-o)

$$(call include-depfiles-for-objs, $$(o))

$(3) += $$(o)
@@ -1404,7 +1404,7 @@ endef 
# $(3): the variable name to collect the output object file.

define compile-dotdot-s-file-no-deps

o := $(intermediates)/$(patsubst %.s,%.o,$(subst ../,$(DOTDOT_REPLACEMENT),$(1)))

$$(o) : $(TOPDIR)$(LOCAL_PATH)/$(1) $(2)

$$(o) : $(TOPDIR)$(LOCAL_PATH)/$(1) $(2) $(CLANG)

	$$(transform-$$(PRIVATE_HOST)s-to-o)

$(3) += $$(o)

endef
@@ -1935,7 +1935,7 @@ $(hide) $(AAPT2) link -o $@ \ 
  $(addprefix --manifest ,$(PRIVATE_ANDROID_MANIFEST)) \

  $(addprefix -I ,$(PRIVATE_AAPT_INCLUDES)) \

  $(addprefix -I ,$(PRIVATE_SHARED_ANDROID_LIBRARIES)) \

  $(addprefix -A ,$(PRIVATE_ASSET_DIR)) \

  $(addprefix -A ,$(foreach d,$(PRIVATE_ASSET_DIR),$(call clean-path,$(d)))) \

  $(addprefix --java ,$(PRIVATE_JAVA_GEN_DIR)) \

  $(addprefix --proguard ,$(PRIVATE_PROGUARD_OPTIONS_FILE)) \

  $(addprefix --min-sdk-version ,$(PRIVATE_DEFAULT_APP_TARGET_SDK)) \

core/executable_internal.mk

+2 −2
Original line number Diff line number Diff line
@@ -74,11 +74,11 @@ $(linked_module): PRIVATE_TARGET_CRTEND_O := $(my_target_crtend_o) 
$(linked_module): PRIVATE_POST_LINK_CMD := $(LOCAL_POST_LINK_CMD)



ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)

$(linked_module): $(my_target_crtbegin_static_o) $(all_objects) $(all_libraries) $(my_target_crtend_o) $(my_target_libcrt_builtins) $(my_target_libgcc) $(my_target_libatomic)

$(linked_module): $(my_target_crtbegin_static_o) $(all_objects) $(all_libraries) $(my_target_crtend_o) $(my_target_libcrt_builtins) $(my_target_libgcc) $(my_target_libatomic) $(CLANG_CXX)

	$(transform-o-to-static-executable)

	$(PRIVATE_POST_LINK_CMD)

else

$(linked_module): $(my_target_crtbegin_dynamic_o) $(all_objects) $(all_libraries) $(my_target_crtend_o) $(my_target_libcrt_builtins) $(my_target_libgcc) $(my_target_libatomic)

$(linked_module): $(my_target_crtbegin_dynamic_o) $(all_objects) $(all_libraries) $(my_target_crtend_o) $(my_target_libcrt_builtins) $(my_target_libgcc) $(my_target_libatomic) $(CLANG_CXX)

	$(transform-o-to-executable)

	$(PRIVATE_POST_LINK_CMD)

endif