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

Commit 29e8a85b authored by David Gross's avatar David Gross Committed by Automerger Merge Worker
Browse files

Merge "Fix bitrot: RSTest_CompatLib[19] tests stopped building" am: 304da398 

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

Change-Id: I3a9c92482ac1d8caa6daf4682d9429825b23a54b
parents 2a678d73 304da398

core/definitions.mk

+2 −2
Original line number Diff line number Diff line
@@ -1106,11 +1106,11 @@ define transform-bc-to-so 
$(hide) mkdir -p $(dir $@)

$(hide) $(BCC_COMPAT) -O3 -o $(dir $@)/$(notdir $(<:.bc=.o)) -fPIC -shared \

  -rt-path $(RS_PREBUILT_CLCORE) -mtriple $(RS_COMPAT_TRIPLE) $<

$(hide) $(PRIVATE_CXX_LINK) -shared -Wl,-soname,$(notdir $@) -nostdlib \

$(hide) $(PRIVATE_CXX_LINK) -fuse-ld=lld -target $(CLANG_TARGET_TRIPLE) -shared -Wl,-soname,$(notdir $@) -nostdlib \

  -Wl,-rpath,\$$ORIGIN/../lib \

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

  $(RS_PREBUILT_COMPILER_RT) \

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

  -o $@ $(CLANG_TARGET_GLOBAL_LLDFLAGS) -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 \

core/java_renderscript.mk

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ renderscript_intermediate := $(intermediates)/renderscript 
# Prevent these from showing up on the device

# One exception is librsjni.so, which is needed for

# both native path and compat path.

rs_jni_lib := $(call intermediates-dir-for,SHARED_LIBRARIES,librsjni.so)/librsjni.so

rs_jni_lib := $(call intermediates-dir-for,SHARED_LIBRARIES,librsjni)/librsjni.so

LOCAL_JNI_SHARED_LIBRARIES += librsjni



ifneq (,$(TARGET_BUILD_USE_PREBUILT_SDKS)$(FORCE_BUILD_RS_COMPAT))