diff --git a/core/Makefile b/core/Makefile index 0c36a602e1..8fb8b7a3da 100644 --- a/core/Makefile +++ b/core/Makefile @@ -778,7 +778,7 @@ $(INSTALLED_FILES_FILE_ROOT) : $(INTERNAL_ROOT_FILES) $(FILESLIST) $(FILESLIST_U $(FILESLIST_UTIL) -c $(@:.txt=.json) > $@ ifeq ($(HOST_OS),linux) -$(call dist-for-goals, sdk win_sdk sdk_addon, $(INSTALLED_FILES_FILE_ROOT)) +$(call dist-for-goals, sdk sdk_addon, $(INSTALLED_FILES_FILE_ROOT)) endif #------------------------------------------------------------------ @@ -2724,7 +2724,7 @@ $(INSTALLED_FILES_FILE): $(FULL_SYSTEMIMAGE_DEPS) $(FILESLIST) $(FILESLIST_UTIL) installed-file-list: $(INSTALLED_FILES_FILE) ifeq ($(HOST_OS),linux) -$(call dist-for-goals, sdk win_sdk sdk_addon, $(INSTALLED_FILES_FILE)) +$(call dist-for-goals, sdk sdk_addon, $(INSTALLED_FILES_FILE)) endif systemimage_intermediates := \ @@ -5860,6 +5860,8 @@ endif # ----------------------------------------------------------------- # The SDK +ifneq ($(filter sdk,$(MAKECMDGOALS)),) + # The SDK includes host-specific components, so it belongs under HOST_OUT. sdk_dir := $(HOST_OUT)/sdk/$(TARGET_PRODUCT) @@ -5869,15 +5871,11 @@ sdk_dir := $(HOST_OUT)/sdk/$(TARGET_PRODUCT) # darwin-x86 --> android-sdk_12345_mac-x86 # windows-x86 --> android-sdk_12345_windows # +ifneq ($(HOST_OS),linux) + $(error Building the monolithic SDK is only supported on Linux) +endif sdk_name := android-sdk_$(FILE_NAME_TAG) -ifeq ($(HOST_OS),darwin) - INTERNAL_SDK_HOST_OS_NAME := mac -else - INTERNAL_SDK_HOST_OS_NAME := $(HOST_OS) -endif -ifneq ($(HOST_OS),windows) - INTERNAL_SDK_HOST_OS_NAME := $(INTERNAL_SDK_HOST_OS_NAME)-$(SDK_HOST_ARCH) -endif +INTERNAL_SDK_HOST_OS_NAME := linux-$(SDK_HOST_ARCH) sdk_name := $(sdk_name)_$(INTERNAL_SDK_HOST_OS_NAME) sdk_dep_file := $(sdk_dir)/sdk_deps.mk @@ -5899,7 +5897,7 @@ atree_dir := development/build sdk_atree_files := \ $(atree_dir)/sdk.exclude.atree \ - $(atree_dir)/sdk-$(HOST_OS)-$(SDK_HOST_ARCH).atree + $(atree_dir)/sdk-linux-$(SDK_HOST_ARCH).atree # development/build/sdk-android-.atree is used to differentiate # between architecture models (e.g. ARMv5TE versus ARMv7) when copying @@ -5981,22 +5979,16 @@ $(INTERNAL_SDK_TARGET): $(deps) -o $(PRIVATE_DIR) && \ cp -f $(target_notice_file_txt) \ $(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \ - cp -f $(tools_notice_file_txt) $(PRIVATE_DIR)/platform-tools/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) && \ cd $(dir $@) && zip -rqX $(notdir $@) $(PRIVATE_NAME) \ ) || ( rm -rf $(PRIVATE_DIR) $@ && exit 44 ) - -# Is a Windows SDK requested? If so, we need some definitions from here -# in order to find the Linux SDK used to create the Windows one. -MAIN_SDK_NAME := $(sdk_name) MAIN_SDK_DIR := $(sdk_dir) MAIN_SDK_ZIP := $(INTERNAL_SDK_TARGET) -ifneq ($(filter win_sdk winsdk-tools,$(MAKECMDGOALS)),) -include $(TOPDIR)development/build/tools/windows_sdk.mk -endif + +endif # sdk in MAKECMDGOALS # ----------------------------------------------------------------- # Findbugs diff --git a/core/main.mk b/core/main.mk index e3aa996803..a2d76aaa98 100644 --- a/core/main.mk +++ b/core/main.mk @@ -359,7 +359,7 @@ endif is_sdk_build := -ifneq ($(filter sdk win_sdk sdk_addon,$(MAKECMDGOALS)),) +ifneq ($(filter sdk sdk_addon,$(MAKECMDGOALS)),) is_sdk_build := true endif @@ -1914,11 +1914,11 @@ endif # TARGET_BUILD_UNBUNDLED == TARGET_BUILD_UNBUNDLED_IMAGE .PHONY: docs docs: $(ALL_DOCS) -.PHONY: sdk win_sdk winsdk-tools sdk_addon +.PHONY: sdk sdk_addon ifeq ($(HOST_OS),linux) ALL_SDK_TARGETS := $(INTERNAL_SDK_TARGET) sdk: $(ALL_SDK_TARGETS) -$(call dist-for-goals,sdk win_sdk, \ +$(call dist-for-goals,sdk, \ $(ALL_SDK_TARGETS) \ $(SYMBOLS_ZIP) \ $(COVERAGE_ZIP) \ diff --git a/core/ninja_config.mk b/core/ninja_config.mk index 2e1bd6915f..2157c9ea4a 100644 --- a/core/ninja_config.mk +++ b/core/ninja_config.mk @@ -38,15 +38,19 @@ PARSE_TIME_MAKE_GOALS := \ test-art% \ user \ userdataimage \ - userdebug \ - win_sdk \ - winsdk-tools + userdebug include $(wildcard vendor/*/build/ninja_config.mk) # Any Android goals that need to be built. ANDROID_GOALS := $(filter-out $(KATI_OUTPUT_PATTERNS),\ $(sort $(ORIGINAL_MAKECMDGOALS) $(MAKECMDGOALS))) +# Temporary compatibility support until the build server configs are updated +ANDROID_GOALS := $(patsubst win_sdk,sdk,$(ANDROID_GOALS)) +ifneq ($(HOST_OS),linux) + ANDROID_GOALS := $(filter-out sdk,$(ANDROID_GOALS)) + ANDROID_GOALS := $(patsubst sdk_repo,sdk-repo-build-tools sdk-repo-platform-tools,$(ANDROID_GOALS)) +endif # Goals we need to pass to Ninja. NINJA_GOALS := $(filter-out $(NINJA_EXCLUDE_GOALS), $(ANDROID_GOALS)) ifndef NINJA_GOALS diff --git a/target/product/sdk_phone_arm64.mk b/target/product/sdk_phone_arm64.mk index 0831b54a2b..4203d45c5e 100644 --- a/target/product/sdk_phone_arm64.mk +++ b/target/product/sdk_phone_arm64.mk @@ -50,10 +50,6 @@ $(call inherit-product-if-exists, device/generic/goldfish/arm64-vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_arm64/device.mk) -# Define the host tools and libs that are parts of the SDK. -$(call inherit-product, sdk/build/product_sdk.mk) -$(call inherit-product, development/build/product_sdk.mk) - # keep this apk for sdk targets for now PRODUCT_PACKAGES += \ EmulatorSmokeTests diff --git a/target/product/sdk_phone_armv7.mk b/target/product/sdk_phone_armv7.mk index f64998043a..6c88b44fd0 100644 --- a/target/product/sdk_phone_armv7.mk +++ b/target/product/sdk_phone_armv7.mk @@ -49,10 +49,6 @@ $(call inherit-product-if-exists, device/generic/goldfish/arm32-vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_arm/device.mk) -# Define the host tools and libs that are parts of the SDK. -$(call inherit-product, sdk/build/product_sdk.mk) -$(call inherit-product, development/build/product_sdk.mk) - # keep this apk for sdk targets for now PRODUCT_PACKAGES += \ EmulatorSmokeTests diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk index 0e1bca4cfd..a324e5f023 100644 --- a/target/product/sdk_phone_x86.mk +++ b/target/product/sdk_phone_x86.mk @@ -49,10 +49,6 @@ $(call inherit-product-if-exists, device/generic/goldfish/x86-vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_x86/device.mk) -# Define the host tools and libs that are parts of the SDK. -$(call inherit-product-if-exists, sdk/build/product_sdk.mk) -$(call inherit-product-if-exists, development/build/product_sdk.mk) - # Overrides PRODUCT_BRAND := Android PRODUCT_NAME := sdk_phone_x86 diff --git a/target/product/sdk_phone_x86_64.mk b/target/product/sdk_phone_x86_64.mk index fffac047e8..ff9018d93f 100644 --- a/target/product/sdk_phone_x86_64.mk +++ b/target/product/sdk_phone_x86_64.mk @@ -50,10 +50,6 @@ $(call inherit-product-if-exists, device/generic/goldfish/x86_64-vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_x86_64/device.mk) -# Define the host tools and libs that are parts of the SDK. -$(call inherit-product-if-exists, sdk/build/product_sdk.mk) -$(call inherit-product-if-exists, development/build/product_sdk.mk) - # Overrides PRODUCT_BRAND := Android PRODUCT_NAME := sdk_phone_x86_64