From c5b7c4fbefa83cf002c5f30c1b4646f35e718ca2 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 12 Jun 2019 05:59:53 +0000 Subject: [PATCH 1/6] Add dependencies on the toolchain (clang, etc) Historically, we've relied on the path to the clang compiler changing in order to trigger rebuilds instead of direct dependencies on the compiler itself. That's somewhat more reliable, since the actual $(CLANG) file is often a script that doesn't actually change during every update. In Soong, we've added the dependency anyway, so do it here as well. This makes it easier for my RBE experiments to identify when we intend to use clang and to send the entire compiler. Test: treehugger Test: build a system image with RBE, find that every command that needed the compiler gets it. Change-Id: I3838b5d77884394a8c0f7a1ba133142102602084 --- core/binary.mk | 22 +++++++++++----------- core/definitions.mk | 8 ++++---- core/executable_internal.mk | 4 ++-- core/host_executable_internal.mk | 2 +- core/shared_library_internal.mk | 2 +- core/static_library_internal.mk | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/core/binary.mk b/core/binary.mk index a420c02d83..ad848626c2 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -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)) diff --git a/core/definitions.mk b/core/definitions.mk index dfb1b7d3f2..e1977ba9b2 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -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 diff --git a/core/executable_internal.mk b/core/executable_internal.mk index c28c144f67..c913a41d4f 100644 --- a/core/executable_internal.mk +++ b/core/executable_internal.mk @@ -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 diff --git a/core/host_executable_internal.mk b/core/host_executable_internal.mk index e72c4192bd..0cf62a4323 100644 --- a/core/host_executable_internal.mk +++ b/core/host_executable_internal.mk @@ -39,7 +39,7 @@ $(LOCAL_BUILT_MODULE): PRIVATE_RPATHS := ../$(my_libdir) $(my_libdir) endif my_libdir := -$(LOCAL_BUILT_MODULE): $(all_objects) $(all_libraries) +$(LOCAL_BUILT_MODULE): $(all_objects) $(all_libraries) $(CLANG_CXX) $(transform-host-o-to-executable) endif # skip_build_from_source diff --git a/core/shared_library_internal.mk b/core/shared_library_internal.mk index 44bb0203bb..746cb722ab 100644 --- a/core/shared_library_internal.mk +++ b/core/shared_library_internal.mk @@ -73,7 +73,7 @@ $(linked_module): \ $(my_target_libcrt_builtins) \ $(my_target_libgcc) \ $(my_target_libatomic) \ - $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(LOCAL_ADDITIONAL_DEPENDENCIES) $(CLANG_CXX) $(transform-o-to-shared-lib) ifeq ($(my_native_coverage),true) diff --git a/core/static_library_internal.mk b/core/static_library_internal.mk index 6b4d22f129..17731e4e3c 100644 --- a/core/static_library_internal.mk +++ b/core/static_library_internal.mk @@ -21,7 +21,7 @@ endif include $(BUILD_SYSTEM)/binary.mk $(LOCAL_BUILT_MODULE) : $(built_whole_libraries) -$(LOCAL_BUILT_MODULE) : $(all_objects) +$(LOCAL_BUILT_MODULE) : $(all_objects) $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_AR) $(transform-o-to-static-lib) ifeq ($(NATIVE_COVERAGE),true) From 0706faa2ac15e9c12c720f43c7bb8171c5efd97c Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 12 Jun 2019 06:05:02 +0000 Subject: [PATCH 2/6] Add missing dependecy on SOONG_ZIP Bug: 130111713 Test: treehugger Change-Id: Ic5b7c4fbefa83cf002c5f30c1b4646f35e718ca2 --- core/package_internal.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/package_internal.mk b/core/package_internal.mk index fcaf947df3..6b1cab49eb 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -651,7 +651,7 @@ endif ## the APK ifdef LOCAL_DEX_PREOPT $(my_dex_jar): PRIVATE_DEX_FILE := $(built_dex) - $(my_dex_jar): $(built_dex) + $(my_dex_jar): $(built_dex) $(SOONG_ZIP) $(hide) mkdir -p $(dir $@) && rm -f $@ $(call create-dex-jar,$@,$(PRIVATE_DEX_FILE)) endif From bbe4e11a7681c52d2197ce35ae47d4939ca246b6 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 12 Jun 2019 17:13:28 +0000 Subject: [PATCH 3/6] Call clean-path in more places When an Android.mk specifies a local path that is outside the current directory, it uses '..', since we prepend $(LOCAL_PATH)/ to the given path. This path ('a/b/../c') gets inserted into command lines and dependencies. For dependencies, when it gets to Ninja, Ninja calls CanonicalizePath and removes those references ('a/c'), but the command line is preserved. So we've got a command line that references 'a/b', but no dependency on it. Usually that's not a big problem, but it's an issue if we're trying to only expose dependencies to the rule, like with RBE only sending the dependencies to the remote workers. So use our 'clean-path' macro to collapse the '..' references in Kati so that they don't show up in the command line either. Test: treehugger Test: build a system image with RBE Change-Id: I0706faa2ac15e9c12c720f43c7bb8171c5efd97c --- core/base_rules.mk | 2 +- core/definitions.mk | 6 +++--- core/prebuilt_internal.mk | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/base_rules.mk b/core/base_rules.mk index 6c7e8831d2..b0e0577a2e 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -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 diff --git a/core/definitions.mk b/core/definitions.mk index e1977ba9b2..717e10ba35 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -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 @@ -1925,7 +1925,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)) \ diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index ad62e1a82f..7006667b00 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -23,13 +23,13 @@ my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)IS_64_BIT) ifdef LOCAL_PREBUILT_MODULE_FILE my_prebuilt_src_file := $(LOCAL_PREBUILT_MODULE_FILE) else ifdef LOCAL_SRC_FILES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) - my_prebuilt_src_file := $(LOCAL_PATH)/$(LOCAL_SRC_FILES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) + my_prebuilt_src_file := $(call clean-path,$(LOCAL_PATH)/$(LOCAL_SRC_FILES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))) LOCAL_SRC_FILES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) := else ifdef LOCAL_SRC_FILES_$(my_32_64_bit_suffix) - my_prebuilt_src_file := $(LOCAL_PATH)/$(LOCAL_SRC_FILES_$(my_32_64_bit_suffix)) + my_prebuilt_src_file := $(call clean-path,$(LOCAL_PATH)/$(LOCAL_SRC_FILES_$(my_32_64_bit_suffix))) LOCAL_SRC_FILES_$(my_32_64_bit_suffix) := else ifdef LOCAL_SRC_FILES - my_prebuilt_src_file := $(LOCAL_PATH)/$(LOCAL_SRC_FILES) + my_prebuilt_src_file := $(call clean-path,$(LOCAL_PATH)/$(LOCAL_SRC_FILES)) LOCAL_SRC_FILES := else ifdef LOCAL_REPLACE_PREBUILT_APK_INSTALLED # This is handled specially in app_prebuilt_internal.mk From b44163006754ac18400edf3d21e3ae5d42b61cab Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 12 Jun 2019 17:25:23 +0000 Subject: [PATCH 4/6] Depend on NDK libraries Bug: 130111713 Test: treehugger Test: build system image with RBE Change-Id: Ibbe4e11a7681c52d2197ce35ae47d4939ca246b6 --- core/binary.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/binary.mk b/core/binary.mk index ad848626c2..f63e4cdee9 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -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), \ From f14179b3ff0e23091d217c5669015c84778cc3e2 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 12 Jun 2019 21:18:31 +0000 Subject: [PATCH 5/6] Fix some java library dependencies Bug: 130111713 Test: treehugger Test: build system image w/RBE Change-Id: I2c76701c1ad396c1b13f873297785c736fba544d --- core/java.mk | 2 +- core/java_library.mk | 2 +- core/package_internal.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/java.mk b/core/java.mk index 449da113a7..b463037fbc 100644 --- a/core/java.mk +++ b/core/java.mk @@ -409,7 +409,7 @@ legacy_proguard_flags := $(addprefix -libraryjars ,$(my_proguard_sdk_raise) \ $(full_shared_java_header_libs))) legacy_proguard_lib_deps := $(my_proguard_sdk_raise) \ - $(filter-out $(my_proguard_sdk_raise),$(full_shared_java_header_libs)) + $(filter-out $(my_proguard_sdk_raise),$(full_java_bootclasspath_libs) $(full_shared_java_header_libs)) legacy_proguard_flags += -printmapping $(proguard_dictionary) legacy_proguard_flags += -printconfiguration $(proguard_configuration) diff --git a/core/java_library.mk b/core/java_library.mk index c706cea724..34e487449e 100644 --- a/core/java_library.mk +++ b/core/java_library.mk @@ -68,7 +68,7 @@ else # !LOCAL_IS_STATIC_JAVA_LIBRARY $(common_javalib.jar): PRIVATE_DEX_FILE := $(built_dex) $(common_javalib.jar): PRIVATE_SOURCE_ARCHIVE := $(full_classes_pre_proguard_jar) $(common_javalib.jar): $(MERGE_ZIPS) $(SOONG_ZIP) $(ZIP2ZIP) -$(common_javalib.jar) : $(built_dex) $(java_resource_sources) | $(ZIPTIME) $(ZIPALIGN) +$(common_javalib.jar) : $(full_classes_pre_proguard_jar) $(built_dex) $(java_resource_sources) | $(ZIPTIME) $(ZIPALIGN) @echo "target Jar: $(PRIVATE_MODULE) ($@)" rm -rf $@.parts && mkdir -p $@.parts $(call create-dex-jar,$@.parts/dex.zip,$(PRIVATE_DEX_FILE)) diff --git a/core/package_internal.mk b/core/package_internal.mk index 6b1cab49eb..d693c585bf 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -428,7 +428,7 @@ ifneq ($(full_classes_jar),) $(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex) # Use the jarjar processed arhive as the initial package file. $(LOCAL_BUILT_MODULE): PRIVATE_SOURCE_ARCHIVE := $(full_classes_pre_proguard_jar) -$(LOCAL_BUILT_MODULE): $(built_dex) +$(LOCAL_BUILT_MODULE): $(built_dex) $(full_classes_pre_proguard_jar) else $(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(LOCAL_BUILT_MODULE): PRIVATE_SOURCE_ARCHIVE := From 6b72c73a503aed59c5e04514cb13fe30ae4aa493 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 12 Jun 2019 21:33:38 +0000 Subject: [PATCH 6/6] Fix dependency on BOARD_AVB_SYSTEM_KEY_PATH Bug: 130111713 Test: treehugger Change-Id: I2183ac9f8c45eec178876768dfcc83ae62445293 --- core/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/Makefile b/core/Makefile index ed4c06a978..79fd0efe11 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2230,6 +2230,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,$@)