resolved conflicts for 9073a5d9
to stage-aosp-master
Change-Id: I9b048cb5fe70215a67ef025e8c7ef6aad86cffb3
This commit is contained in:
commit
ba2355c981
1 changed files with 2 additions and 2 deletions
|
@ -724,9 +724,9 @@ 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/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
|
||||
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
|
||||
|
||||
# API Level lists for Renderscript Compat lib.
|
||||
|
|
Loading…
Reference in a new issue