tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Update naming of platforms subdir""

Browse source
This commit is contained in:
Treehugger Robot 2022-10-26 17:17:28 +00:00 committed by Gerrit Code Review
commit b41bb81505
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/Makefile
View file

@ -6829,11 +6829,7 @@ $(INTERNAL_SDK_TARGET): PRIVATE_NAME := $(sdk_name)
$(INTERNAL_SDK_TARGET): PRIVATE_DIR := $(sdk_dir)/$(sdk_name) $(INTERNAL_SDK_TARGET): PRIVATE_DIR := $(sdk_dir)/$(sdk_name)
$(INTERNAL_SDK_TARGET): PRIVATE_DEP_FILE := $(sdk_dep_file) $(INTERNAL_SDK_TARGET): PRIVATE_DEP_FILE := $(sdk_dep_file)
$(INTERNAL_SDK_TARGET): PRIVATE_INPUT_FILES := $(sdk_atree_files) $(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. # Set SDK_GNU_ERROR to non-empty to fail when a GNU target is built.
# #
#SDK_GNU_ERROR := true #SDK_GNU_ERROR := true
@ -6858,7 +6854,7 @@ $(INTERNAL_SDK_TARGET): $(deps)
-I $(PRODUCT_OUT) \ -I $(PRODUCT_OUT) \
-I $(HOST_OUT) \ -I $(HOST_OUT) \
-I $(TARGET_COMMON_OUT_ROOT) \ -I $(TARGET_COMMON_OUT_ROOT) \
-v "PLATFORM_NAME=$(PRIVATE_PLATFORM_NAME)" \ -v "PLATFORM_NAME=android-$(PLATFORM_VERSION)" \
-v "OUT_DIR=$(OUT_DIR)" \ -v "OUT_DIR=$(OUT_DIR)" \
-v "HOST_OUT=$(HOST_OUT)" \ -v "HOST_OUT=$(HOST_OUT)" \
-v "TARGET_ARCH=$(TARGET_ARCH)" \ -v "TARGET_ARCH=$(TARGET_ARCH)" \