diff options
| author | Anton Hansson <hansson@google.com> | 2022-10-19 11:52:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-10-19 11:52:32 +0000 |
| commit | 2e55cb4f6b2f1eb75a425847686e250c05b3fde6 (patch) | |
| tree | 367c16249ff69842a91b95a32de41e893e627411 | |
| parent | e790bc6f0ac904bd2a3c199da5272d488859b16c (diff) | |
| parent | 8b222091843e82104d217e6c2a27a6df961fd4fb (diff) | |
| download | build-2e55cb4f6b2f1eb75a425847686e250c05b3fde6.tar.gz | |
Merge "Update naming of platforms subdir"
| -rw-r--r-- | core/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index 317b6906aa..1dfb603c37 100644 --- a/core/Makefile +++ b/core/Makefile @@ -6827,7 +6827,11 @@ $(INTERNAL_SDK_TARGET): PRIVATE_NAME := $(sdk_name) $(INTERNAL_SDK_TARGET): PRIVATE_DIR := $(sdk_dir)/$(sdk_name) $(INTERNAL_SDK_TARGET): PRIVATE_DEP_FILE := $(sdk_dep_file) $(INTERNAL_SDK_TARGET): PRIVATE_INPUT_FILES := $(sdk_atree_files) - +$(INTERNAL_SDK_TARGET): PRIVATE_PLATFORM_NAME := \ + $(strip $(if $(filter $(PLATFORM_SDK_EXTENSION_VERSION),$(PLATFORM_BASE_SDK_EXTENSION_VERSION)),\ + android-$(PLATFORM_SDK_VERSION),\ + android-$(PLATFORM_SDK_VERSION)-ext$(PLATFORM_SDK_EXTENSION_VERSION)) \ +) # Set SDK_GNU_ERROR to non-empty to fail when a GNU target is built. # #SDK_GNU_ERROR := true @@ -6852,7 +6856,7 @@ $(INTERNAL_SDK_TARGET): $(deps) -I $(PRODUCT_OUT) \ -I $(HOST_OUT) \ -I $(TARGET_COMMON_OUT_ROOT) \ - -v "PLATFORM_NAME=android-$(PLATFORM_VERSION)" \ + -v "PLATFORM_NAME=$(PRIVATE_PLATFORM_NAME)" \ -v "OUT_DIR=$(OUT_DIR)" \ -v "HOST_OUT=$(HOST_OUT)" \ -v "TARGET_ARCH=$(TARGET_ARCH)" \ |