diff options
author | Anton Hansson <hansson@google.com> | 2022-05-26 16:07:25 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-05-26 16:07:25 +0000 |
commit | e59bd2aa7c70511611d4a54138b655dbbdf4eb2a (patch) | |
tree | e8f468d3a1fceed6daaca66ce9a028dc252afdc4 | |
parent | 42d97799f33ec94f631d97d2b2f140db96b016aa (diff) | |
parent | 28f089d9b0c8f61e865a9e0e6131b7a42db43ab1 (diff) | |
download | build-e59bd2aa7c70511611d4a54138b655dbbdf4eb2a.tar.gz |
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
-rw-r--r-- | core/Makefile | 30 | ||||
-rw-r--r-- | core/main.mk | 4 | ||||
-rw-r--r-- | target/product/sdk.mk | 7 |
3 files changed, 6 insertions, 35 deletions
diff --git a/core/Makefile b/core/Makefile index 93b3e03af7..de9fd52c12 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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) \ + $(INSTALLED_SDK_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) && \ diff --git a/core/main.mk b/core/main.mk index e0efdad61e..c63c6dfde9 100644 --- a/core/main.mk +++ b/core/main.mk @@ -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 diff --git a/target/product/sdk.mk b/target/product/sdk.mk index 96d8cc94e1..fa7e1ad381 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -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 |