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

Commit e59bd2aa authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge changes from topic "sdk-refactor-tmd" into tm-dev 

* changes:
  Slim down the sdk product
  Remove unused dependencies from sdk goals
  Remove notice file for sdk system image
parents 42d97799 28f089d9

core/Makefile

+1 −29
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)
@@ -1571,7 +1564,6 @@ ifndef TARGET_BUILD_APPS 
# TODO These intermediate NOTICE.txt/NOTICE.html files should go into

# TARGET_OUT_NOTICE_FILES now that the notice files are gathered from

# the src subdirectory.

target_notice_file_txt := $(TARGET_OUT_INTERMEDIATES)/NOTICE.txt

kernel_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/kernel.txt

winpthreads_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/winpthreads.txt
@@ -3109,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
@@ -6799,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
@@ -6825,21 +6811,9 @@ sdk_atree_files += $(atree_dir)/sdk.atree 
endif



deps := \

	$(target_notice_file_txt) \

	$(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 \
@@ -6882,8 +6856,6 @@ $(INTERNAL_SDK_TARGET): $(deps) 
	        -v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \

	        -v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \

	        -o $(PRIVATE_DIR) && \

	    cp -f $(target_notice_file_txt) \

	            $(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \

	    HOST_OUT_EXECUTABLES=$(HOST_OUT_EXECUTABLES) HOST_OS=$(HOST_OS) \

	        development/build/tools/sdk_clean.sh $(PRIVATE_DIR) && \

	    chmod -R ug+rwX $(PRIVATE_DIR) && \

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

target/product/sdk.mk

+5 −2
Original line number Diff line number Diff line
@@ -14,8 +14,11 @@ 
# limitations under the License.

#



# Don't modify this file - It's just an alias!

# This is a simple product that uses configures the minimum amount

# needed to build the SDK (without the emulator).



$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_phone_armv7.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)



PRODUCT_NAME := sdk

PRODUCT_BRAND := Android

PRODUCT_DEVICE := mainline_x86