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

Commit 25a34bc6 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Update naming of platforms subdir" am: 2e55cb4f am: 1c4cc158 

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



Change-Id: Ib0275a1fd6823794ee4c21de9c5f0b50e3cc56d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3a4b10e9 1c4cc158

core/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -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)" \