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

Commit 46eac312 authored by Stephen Hines's avatar Stephen Hines Committed by Android Git Automerger
Browse files

am ba2355c9: resolved conflicts for 9073a5d9 to stage-aosp-master 

* commit 'ba2355c9':
  Fix RS NDK usage so we always pull from "current" instead of NDK 8.
parents 128f01cf ba2355c9

core/config.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -724,9 +724,9 @@ endif 
RS_PREBUILT_CLCORE := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/librsrt_$(TARGET_ARCH).bc

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

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

ifeq (true,$(TARGET_IS_64_BIT))

ifeq (true,$(TARGET_IS_64_BIT))

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

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

else

else

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

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

endif

endif





# API Level lists for Renderscript Compat lib.

# API Level lists for Renderscript Compat lib.