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

Commit a9fed83f authored by Miao Wang's avatar Miao Wang
Browse files

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
parent 53681310

core/config.mk

+3 −3
Original line number Diff line number Diff line
@@ -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.

core/definitions.mk

+3 −2
Original line number Diff line number Diff line
@@ -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



###########################################################