am 62d49dc5: Merge "Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib."

* commit '62d49dc5db94a5452b87aa3b31cb623987356f51':
  Make bcc-compat able to pick the right mtriple flag for Renderscript Compat Lib.
This commit is contained in:
Miao Wang 2015-01-16 16:44:17 +00:00 committed by Android Git Automerger
commit eb66dc39a9
2 changed files with 2 additions and 2 deletions

View file

@ -63,4 +63,4 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \
$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS :=
RS_COMPAT_TRIPLE := armv7-none-linux-gnueabi
$(clang_2nd_arch_prefix)RS_COMPAT_TRIPLE := armv7-none-linux-gnueabi

View file

@ -63,4 +63,4 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \
$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := -D__i386__
RS_COMPAT_TRIPLE := i686-linux-android
$(clang_2nd_arch_prefix)RS_COMPAT_TRIPLE := i686-linux-android