diff options
| author | David Gross <dgross@google.com> | 2021-07-14 18:34:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-07-14 18:34:58 +0000 |
| commit | 304da3988d59b4fdd4c7a898bde37c9e3f0d1c60 (patch) | |
| tree | dce84de867a5aa93509e5e0b61cd0887d70127d7 | |
| parent | 660fdcd6648d78a733f71900d3870abbea3a3594 (diff) | |
| parent | dd400c3af140111e9a496642b6f8f9ed1ca0f52a (diff) | |
| download | build-android-s-beta-4.tar.gz | |
Merge "Fix bitrot: RSTest_CompatLib[19] tests stopped building"android-s-beta-4android-s-beta-3android-s-beta-4
| -rw-r--r-- | core/definitions.mk | 4 | ||||
| -rw-r--r-- | core/java_renderscript.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 10c2a5fbed..0fd023abf5 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -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 \ diff --git a/core/java_renderscript.mk b/core/java_renderscript.mk index 572d6e4a4b..055ff14600 100644 --- a/core/java_renderscript.mk +++ b/core/java_renderscript.mk @@ -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)) |