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

Commit 3a3e6018 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Remove unused dependencies from sdk goals" am: 59f95bcd 

Original change: https://android-review.googlesource.com/c/platform/build/+/2096393



Change-Id: I3ebbdd2ce53488f5298163d7f94cacf0f1d41296
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 92fb295d 59f95bcd

core/Makefile

+1 −25
Original line number Diff line number Diff line
@@ -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_JSON_ROOT))



ifeq ($(HOST_OS),linux)

$(call dist-for-goals, sdk sdk_addon, $(INSTALLED_FILES_FILE_ROOT))

endif



#------------------------------------------------------------------

# dtb

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_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



ifeq ($(BOARD_RAMDISK_USE_LZ4),true)
@@ -3108,10 +3101,6 @@ $(eval $(call declare-0p-target,$(INSTALLED_FILES_JSON))) 
.PHONY: installed-file-list

installed-file-list: $(INSTALLED_FILES_FILE)



ifeq ($(HOST_OS),linux)

$(call dist-for-goals, sdk sdk_addon, $(INSTALLED_FILES_FILE))

endif



systemimage_intermediates := \

    $(call intermediates-dir-for,PACKAGING,systemimage)

BUILT_SYSTEMIMAGE := $(systemimage_intermediates)/system.img
@@ -6798,8 +6787,6 @@ ATREE_FILES := 
# if we don't have a real list, then use "everything"

ifeq ($(strip $(ATREE_FILES)),)

ATREE_FILES := \

	$(ALL_DEFAULT_INSTALLED_MODULES) \

	$(INSTALLED_RAMDISK_TARGET) \

	$(ALL_DOCS) \

	$(ALL_SDK_FILES)

endif
@@ -6828,18 +6815,7 @@ include $(BUILD_SYSTEM)/sdk_font.mk 
deps := \

	$(OUT_DOCS)/offline-sdk-timestamp \

	$(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_BUILD_PROP_TARGET) \

	$(ATREE_FILES) \

	$(sdk_atree_files) \

	$(HOST_OUT_EXECUTABLES)/atree \

core/main.mk

+0 −4
Original line number Diff line number Diff line
@@ -1936,10 +1936,6 @@ ALL_SDK_TARGETS := $(INTERNAL_SDK_TARGET) 
sdk: $(ALL_SDK_TARGETS)

$(call dist-for-goals,sdk, \

    $(ALL_SDK_TARGETS) \

    $(SYMBOLS_ZIP) \

    $(SYMBOLS_MAPPING) \

    $(COVERAGE_ZIP) \

    $(APPCOMPAT_ZIP) \

    $(INSTALLED_BUILD_PROP_TARGET) \

)

endif