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

Commit 28e78f46 authored by Miao Wang's avatar Miao Wang
Browse files

Correctly set the linker search path for libm and libc. 

  - ndk/r10 is removed, we need to use SOONG ndk stubs instead.
  - Use MIN_SUPPORTED_SDK_VERSION instead of hard coded version 9 for
    32 bit compilation.

Bug: 38342163
Test: mm
Test: make -j40 FORCE_BUILD_RS_COMPAT=true RSTest_Compat
Change-Id: I9549446cb7f8faee8842b06f096d035535dc7f3d
parent 7d607a19

core/config.mk

+0 −6
Original line number Diff line number Diff line
@@ -825,12 +825,6 @@ endif 


RS_PREBUILT_CLCORE := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/librsrt_$(TARGET_ARCH).bc

RS_PREBUILT_COMPILER_RT := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/libcompiler_rt.a

ifeq (true,$(TARGET_IS_64_BIT))

RS_PREBUILT_LIBPATH := -L prebuilts/ndk/r10/platforms/android-21/arch-$(TARGET_ARCH)/usr/lib64 \

                       -L prebuilts/ndk/r10/platforms/android-21/arch-$(TARGET_ARCH)/usr/lib

else

RS_PREBUILT_LIBPATH := -L prebuilts/ndk/r10/platforms/android-9/arch-$(TARGET_ARCH)/usr/lib

endif



# API Level lists for Renderscript Compat lib.

RSCOMPAT_32BIT_ONLY_API_LEVELS := 8 9 10 11 12 13 14 15 16 17 18 19 20

core/definitions.mk

+3 −2
Original line number Diff line number Diff line
@@ -1056,8 +1056,9 @@ $(hide) $(PRIVATE_CXX) -shared -Wl,-soname,$(notdir $@) -nostdlib \ 
	-Wl,-rpath,\$$ORIGIN/../lib \

	$(dir $@)/$(notdir $(<:.bc=.o)) \

	$(RS_PREBUILT_COMPILER_RT) \

	-o $@ $(TARGET_GLOBAL_LDFLAGS) -Wl,--hash-style=sysv -L prebuilts/gcc/ \

	$(RS_PREBUILT_LIBPATH) \

	-o $@ $(TARGET_GLOBAL_LDFLAGS) -Wl,--hash-style=sysv \

	-L $(SOONG_OUT_DIR)/ndk/platforms/android-$(PRIVATE_SDK_VERSION)/arch-$(TARGET_ARCH)/usr/lib64 \

	-L $(SOONG_OUT_DIR)/ndk/platforms/android-$(PRIVATE_SDK_VERSION)/arch-$(TARGET_ARCH)/usr/lib \

	$(call intermediates-dir-for,SHARED_LIBRARIES,libRSSupport)/libRSSupport.so \

	-lm -lc

endef

core/java.mk

+9 −1
Original line number Diff line number Diff line
@@ -299,13 +299,21 @@ rs_support_io_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/libRSSupportIO.so 
LOCAL_JNI_SHARED_LIBRARIES += libRSSupportIO

endif



my_arch := $(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)

ifneq (,$(filter arm64 mips64 x86_64,$(my_arch)))

  my_min_sdk_version := 21

else

  my_min_sdk_version := $(MIN_SUPPORTED_SDK_VERSION)

endif



$(rs_compatibility_jni_libs): $(RenderScript_file_stamp) $(RS_PREBUILT_CLCORE) \

    $(rs_support_lib) $(rs_support_io_lib) $(rs_jni_lib) $(rs_compiler_rt)

$(rs_compatibility_jni_libs): $(BCC_COMPAT)

$(rs_compatibility_jni_libs): PRIVATE_CXX := $(CXX_WRAPPER) $(TARGET_CXX)

$(rs_compatibility_jni_libs): PRIVATE_SDK_VERSION := $(my_min_sdk_version)

$(rs_compatibility_jni_libs): $(renderscript_intermediate)/librs.%.so: \

    $(renderscript_intermediate.bc_folder)%.bc

    $(renderscript_intermediate.bc_folder)%.bc \

    $(SOONG_OUT_DIR)/ndk.timestamp

	$(transform-bc-to-so)



endif