From a9fed83fae2b5fff36eb8ad1826df2cfd7cd7204 Mon Sep 17 00:00:00 2001 From: Miao Wang Date: Thu, 25 May 2017 19:06:37 -0700 Subject: [PATCH] Update RenderScript build config and definitions. Bug: 38342163 - obj/lib is deprecated and TARGET_OUT_INTERMEDIATE_LIBRARIES will be removed. We need to use per-module intermediates directory instead. - prebuilts/ndk/current folder is gone. For libm and libc, we just need ndk/r10 as stub libs for linking. Test: mm and made sure this does not affect on device target. Test: make -j50 FORCE_BUILD_RS_COMPAT=true RSTest_Compat works as expected. Change-Id: I8fbf5c10322707849a23c6b0dacc28b028db451e --- core/config.mk | 6 +++--- core/definitions.mk | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/config.mk b/core/config.mk index 42f61489c..6a52ea752 100644 --- a/core/config.mk +++ b/core/config.mk @@ -824,10 +824,10 @@ 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/current/platforms/android-21/arch-$(TARGET_ARCH)/usr/lib64 \ - -L prebuilts/ndk/current/platforms/android-21/arch-$(TARGET_ARCH)/usr/lib +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/current/platforms/android-9/arch-$(TARGET_ARCH)/usr/lib +RS_PREBUILT_LIBPATH := -L prebuilts/ndk/r10/platforms/android-9/arch-$(TARGET_ARCH)/usr/lib endif # API Level lists for Renderscript Compat lib. diff --git a/core/definitions.mk b/core/definitions.mk index 63b123ea6..b5d6326fe 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1049,8 +1049,9 @@ $(hide) $(PRIVATE_CXX) -shared -Wl,-soname,$(notdir $@) -nostdlib \ $(dir $@)/$(notdir $(<:.bc=.o)) \ $(RS_PREBUILT_COMPILER_RT) \ -o $@ $(TARGET_GLOBAL_LDFLAGS) -Wl,--hash-style=sysv -L prebuilts/gcc/ \ - $(RS_PREBUILT_LIBPATH) -L $(TARGET_OUT_INTERMEDIATE_LIBRARIES) \ - -lRSSupport -lm -lc + $(RS_PREBUILT_LIBPATH) \ + $(call intermediates-dir-for,SHARED_LIBRARIES,libRSSupport)/libRSSupport.so \ + -lm -lc endef ###########################################################