StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adapt to rearranged NDK sysroot." am: 40472c2371

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518135

Change-Id: Ied98c79a80e58530ea88a175cf6afb0053fdbaa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-04-06 21:12:27 +00:00
committed by Automerger Merge Worker
parent ddc0d018e8 40472c2371
commit 166753a939
1 changed files with 3 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/binary.mk
View File

@@ -168,7 +168,6 @@ my_allow_undefined_symbols := true
endif endif
endif endif
my_ndk_sysroot :=
my_ndk_sysroot_include := my_ndk_sysroot_include :=
my_ndk_sysroot_lib := my_ndk_sysroot_lib :=
my_api_level := 10000 my_api_level := 10000
@@ -183,11 +182,7 @@ ifneq ($(LOCAL_SDK_VERSION),)
# Make sure we've built the NDK. # Make sure we've built the NDK.
my_additional_dependencies += $(SOONG_OUT_DIR)/ndk_base.timestamp my_additional_dependencies += $(SOONG_OUT_DIR)/ndk_base.timestamp
ifneq (,$(filter arm64 x86_64,$(my_arch))) my_min_sdk_version := $(MIN_SUPPORTED_SDK_VERSION)
my_min_sdk_version := 21
else
my_min_sdk_version := $(MIN_SUPPORTED_SDK_VERSION)
endif
# Historically we've just set up a bunch of symlinks in prebuilts/ndk to map # Historically we've just set up a bunch of symlinks in prebuilts/ndk to map
# missing API levels to existing ones where necessary, but we're not doing # missing API levels to existing ones where necessary, but we're not doing
@@ -200,38 +195,19 @@ ifneq ($(LOCAL_SDK_VERSION),)
my_ndk_crt_version := $(my_ndk_api) my_ndk_crt_version := $(my_ndk_api)
my_ndk_hist_api := $(my_ndk_api) ifneq ($(my_ndk_api),current)
ifeq ($(my_ndk_api),current)
# The last API level supported by the old prebuilt NDKs.
my_ndk_hist_api := 24
else
my_api_level := $(my_ndk_api) my_api_level := $(my_ndk_api)
endif endif
my_ndk_source_root := \ my_ndk_source_root := \
$(HISTORICAL_NDK_VERSIONS_ROOT)/$(LOCAL_NDK_VERSION)/sources $(HISTORICAL_NDK_VERSIONS_ROOT)/$(LOCAL_NDK_VERSION)/sources
my_ndk_sysroot := \
$(HISTORICAL_NDK_VERSIONS_ROOT)/$(LOCAL_NDK_VERSION)/platforms/android-$(my_ndk_hist_api)/arch-$(my_arch)
my_built_ndk := $(SOONG_OUT_DIR)/ndk my_built_ndk := $(SOONG_OUT_DIR)/ndk
my_ndk_triple := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_NDK_TRIPLE) my_ndk_triple := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_NDK_TRIPLE)
my_ndk_sysroot_include := \ my_ndk_sysroot_include := \
$(my_built_ndk)/sysroot/usr/include \ $(my_built_ndk)/sysroot/usr/include \
$(my_built_ndk)/sysroot/usr/include/$(my_ndk_triple) \ $(my_built_ndk)/sysroot/usr/include/$(my_ndk_triple) \
$(my_ndk_sysroot)/usr/include \
# x86_64 is a multilib toolchain, so their libraries are my_ndk_sysroot_lib := $(my_built_ndk)/sysroot/usr/lib/$(my_ndk_triple)/$(my_ndk_api)
# installed in /usr/lib64. Aarch64, on the other hand, is not a multilib
# compiler, so its libraries are in /usr/lib.
ifneq (,$(filter x86_64,$(my_arch)))
my_ndk_libdir_name := lib64
else
my_ndk_libdir_name := lib
endif
my_ndk_platform_dir := \
$(my_built_ndk)/platforms/android-$(my_ndk_api)/arch-$(my_arch)
my_built_ndk_libs := $(my_ndk_platform_dir)/usr/$(my_ndk_libdir_name)
my_ndk_sysroot_lib := $(my_ndk_sysroot)/usr/$(my_ndk_libdir_name)
# The bionic linker now has support for packed relocations and gnu style # The bionic linker now has support for packed relocations and gnu style
# hashes (which are much faster!), but shipping to older devices requires # hashes (which are much faster!), but shipping to older devices requires
@@ -1428,7 +1404,6 @@ my_system_shared_libraries_fullpath := \
my_ndk_shared_libraries_fullpath := \ my_ndk_shared_libraries_fullpath := \
$(foreach _lib,$(my_ndk_shared_libraries),\ $(foreach _lib,$(my_ndk_shared_libraries),\
$(if $(filter $(NDK_KNOWN_LIBS),$(_lib)),\ $(if $(filter $(NDK_KNOWN_LIBS),$(_lib)),\
$(my_built_ndk_libs)/$(_lib)$(so_suffix),\
$(my_ndk_sysroot_lib)/$(_lib)$(so_suffix))) $(my_ndk_sysroot_lib)/$(_lib)$(so_suffix)))
built_shared_libraries += \ built_shared_libraries += \