commit 17d7f378871dda3c223a47710e9230758a7fc701
author Ying Wang <wangying@google.com> Thu Sep 23 21:41:23 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 23 21:41:23 2010 -0700
tree a9db65e7357334e9228e1577cc9c07388f433689
parent b7ece4a7c9780e70c716304339543023f488dad8
parent 5611a6e8270af77759dc128749a5a92d3881cbea

am 5611a6e8: am 23d26c04: Merged prebuilt NDKs for different Build OS.

Merge commit '5611a6e8270af77759dc128749a5a92d3881cbea'

* commit '5611a6e8270af77759dc128749a5a92d3881cbea':
  Merged prebuilt NDKs for different Build OS.

libstlport.mk

diff --git a/libstlport.mk b/libstlport.mk
index 8cc0130..3cbe61f 100644
--- a/libstlport.mk
+++ b/libstlport.mk
@@ -6,7 +6,7 @@
 endif
 
 ifdef LOCAL_NDK_VERSION
-stlport_NDK_VERSION_ROOT := $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r$(LOCAL_NDK_VERSION)/$(BUILD_OS)/platforms/android-$(LOCAL_SDK_VERSION)/arch-$(TARGET_ARCH)
+stlport_NDK_VERSION_ROOT := $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r$(LOCAL_NDK_VERSION)/platforms/android-$(LOCAL_SDK_VERSION)/arch-$(TARGET_ARCH)
 LOCAL_C_INCLUDES := \
 	$(stlport_NDK_VERSION_ROOT) \
 	external/stlport/stlport \