StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unused dependencies from sdk goals"

Browse Source
This commit is contained in:
Anton Hansson
2022-05-13 08:55:55 +00:00
committed by Gerrit Code Review
parent 69b1b0c10a 55a8f02ea8
commit 59f95bcd1c
2 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/Makefile
View File

@@ -842,10 +842,6 @@ $(INSTALLED_FILES_FILE_ROOT) : $(INTERNAL_ROOT_FILES) $(FILESLIST) $(FILESLIST_U
$(call declare-0p-target,$(INSTALLED_FILES_FILE_ROOT)) $(call declare-0p-target,$(INSTALLED_FILES_FILE_ROOT))
$(call declare-0p-target,$(INSTALLED_FILES_JSON_ROOT)) $(call declare-0p-target,$(INSTALLED_FILES_JSON_ROOT))
ifeq ($(HOST_OS),linux)
$(call dist-for-goals, sdk sdk_addon, $(INSTALLED_FILES_FILE_ROOT))
endif
#------------------------------------------------------------------ #------------------------------------------------------------------
# dtb # dtb
ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG
@@ -877,9 +873,6 @@ $(INSTALLED_FILES_FILE_RAMDISK) : $(INTERNAL_RAMDISK_FILES) $(FILESLIST) $(FILES
$(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_RAMDISK))) $(eval $(call declare-0p-target,$(INSTALLED_FILES_FILE_RAMDISK)))
$(eval $(call declare-0p-target,$(INSTALLED_FILES_JSON_RAMDISK))) $(eval $(call declare-0p-target,$(INSTALLED_FILES_JSON_RAMDISK)))
ifeq ($(HOST_OS),linux)
$(call dist-for-goals, sdk sdk_addon, $(INSTALLED_FILES_FILE_RAMDISK))
endif
BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img
ifeq ($(BOARD_RAMDISK_USE_LZ4),true) ifeq ($(BOARD_RAMDISK_USE_LZ4),true)
@@ -3108,10 +3101,6 @@ $(eval $(call declare-0p-target,$(INSTALLED_FILES_JSON)))
.PHONY: installed-file-list .PHONY: installed-file-list
installed-file-list: $(INSTALLED_FILES_FILE) installed-file-list: $(INSTALLED_FILES_FILE)
ifeq ($(HOST_OS),linux)
$(call dist-for-goals, sdk sdk_addon, $(INSTALLED_FILES_FILE))
endif
systemimage_intermediates := \ systemimage_intermediates := \
$(call intermediates-dir-for,PACKAGING,systemimage) $(call intermediates-dir-for,PACKAGING,systemimage)
BUILT_SYSTEMIMAGE := $(systemimage_intermediates)/system.img BUILT_SYSTEMIMAGE := $(systemimage_intermediates)/system.img
@@ -6798,8 +6787,6 @@ ATREE_FILES :=
# if we don't have a real list, then use "everything" # if we don't have a real list, then use "everything"
ifeq ($(strip $(ATREE_FILES)),) ifeq ($(strip $(ATREE_FILES)),)
ATREE_FILES := \ ATREE_FILES := \
$(ALL_DEFAULT_INSTALLED_MODULES) \
$(INSTALLED_RAMDISK_TARGET) \
$(ALL_DOCS) \ $(ALL_DOCS) \
$(ALL_SDK_FILES) $(ALL_SDK_FILES)
endif endif
@@ -6828,18 +6815,7 @@ include $(BUILD_SYSTEM)/sdk_font.mk
deps := \ deps := \
$(OUT_DOCS)/offline-sdk-timestamp \ $(OUT_DOCS)/offline-sdk-timestamp \
$(SDK_METADATA_FILES) \ $(SDK_METADATA_FILES) \
$(SYMBOLS_ZIP) \
$(COVERAGE_ZIP) \
$(APPCOMPAT_ZIP) \
$(INSTALLED_SYSTEMIMAGE_TARGET) \
$(INSTALLED_QEMU_SYSTEMIMAGE) \
$(INSTALLED_QEMU_RAMDISKIMAGE) \
$(INSTALLED_QEMU_VENDORIMAGE) \
$(QEMU_VERIFIED_BOOT_PARAMS) \
$(INSTALLED_USERDATAIMAGE_TARGET) \
$(INSTALLED_RAMDISK_TARGET) \
$(INSTALLED_SDK_BUILD_PROP_TARGET) \ $(INSTALLED_SDK_BUILD_PROP_TARGET) \
$(INSTALLED_BUILD_PROP_TARGET) \
$(ATREE_FILES) \ $(ATREE_FILES) \
$(sdk_atree_files) \ $(sdk_atree_files) \
$(HOST_OUT_EXECUTABLES)/atree \ $(HOST_OUT_EXECUTABLES)/atree \

4
core/main.mk
View File

@@ -1936,10 +1936,6 @@ ALL_SDK_TARGETS := $(INTERNAL_SDK_TARGET)
sdk: $(ALL_SDK_TARGETS) sdk: $(ALL_SDK_TARGETS)
$(call dist-for-goals,sdk, \ $(call dist-for-goals,sdk, \
$(ALL_SDK_TARGETS) \ $(ALL_SDK_TARGETS) \
$(SYMBOLS_ZIP) \
$(SYMBOLS_MAPPING) \
$(COVERAGE_ZIP) \
$(APPCOMPAT_ZIP) \
$(INSTALLED_BUILD_PROP_TARGET) \ $(INSTALLED_BUILD_PROP_TARGET) \
) )
endif endif