commit 7cba1be8eaca05d3314295c52e69676d75b0b816
author Miao Wang <miaowang@google.com> Tue Sep 22 00:23:03 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 22 00:23:03 2015 +0000
tree 56accded46adc4db231c114bdc708c8869a1c8a5
parent 3d83076d214287b91fa1e103e09c8ffea044b8f4
parent e3bbb6a575d60e382e2c7882803be078db983d21

am e3bbb6a5: Merge "[RenderScript] making the gemmlowp token more descriptive"

* commit 'e3bbb6a575d60e382e2c7882803be078db983d21':
  [RenderScript] making the gemmlowp token more descriptive

v8/renderscript/rs_support/Android.mk

diff --git a/v8/renderscript/rs_support/Android.mk b/v8/renderscript/rs_support/Android.mk
index be3f47d..7781fdf 100644
--- a/v8/renderscript/rs_support/Android.mk
+++ b/v8/renderscript/rs_support/Android.mk
@@ -159,7 +159,7 @@
 LOCAL_C_INCLUDES += external/cblas/include
 LOCAL_C_INCLUDES += external/gemmlowp/eight_bit_int_gemm
 
-LOCAL_CFLAGS += $(rs_base_CFLAGS) -DGEMMLOWP_USE_OLD_ANDROID_SDK
+LOCAL_CFLAGS += $(rs_base_CFLAGS) -DGEMMLOWP_USE_STLPORT
 
 LOCAL_MODULE:= libRSSupport
 LOCAL_MODULE_TAGS := optional