Permalink
Browse files

Revert "Unbundle libstlport with NDK r4."

This reverts commit f581c1e.
Now unbundled native code should instead use:
LOCAL_NDK_STL_VARIANT := stlport_static
which is the NDK prebuilt version of stlport.

Change-Id: Ib890a8580dedb1f5e89d2889859cc0f0854340d4
Bug: 6932421
  • Loading branch information...
1 parent 4c86b6e commit 30865cb901602ed078ff2ed534529d847b3b54b5 @wangying1015 wangying1015 committed Aug 14, 2012
Showing with 0 additions and 33 deletions.
  1. +0 −10 Android.mk
  2. +0 −10 libstlport.mk
  3. +0 −13 stlport/stl/config/_android.h
View
@@ -52,11 +52,6 @@ LOCAL_MODULE := libstlport
LOCAL_CFLAGS := $(libstlport_cflags)
LOCAL_CPPFLAGS := $(libstlport_cppflags)
-ifeq ($(TARGET_ARCH),arm)
-LOCAL_NDK_VERSION := 4
-LOCAL_SDK_VERSION := 8
-endif
-
include $(LOCAL_PATH)/libstlport.mk
include $(BUILD_SHARED_LIBRARY)
@@ -70,10 +65,5 @@ LOCAL_MODULE := libstlport_static
LOCAL_CFLAGS := $(libstlport_cflags)
LOCAL_CPPFLAGS := $(libstlport_cppflags)
-ifeq ($(TARGET_ARCH),arm)
-LOCAL_NDK_VERSION := 4
-LOCAL_SDK_VERSION := 8
-endif
-
include $(LOCAL_PATH)/libstlport.mk
include $(BUILD_STATIC_LIBRARY)
View
@@ -1,17 +1,7 @@
# Add a couple include paths to use stlport.
-ifdef LOCAL_NDK_VERSION
-stlport_NDK_VERSION_ROOT := $(HISTORICAL_NDK_VERSIONS_ROOT)/$(LOCAL_NDK_VERSION)/platforms/android-$(LOCAL_SDK_VERSION)/arch-$(TARGET_ARCH)
-LOCAL_C_INCLUDES := \
- $(stlport_NDK_VERSION_ROOT) \
- external/stlport/stlport \
- $(LOCAL_C_INCLUDES)
-
-LOCAL_CFLAGS += -DBUILD_WITH_NDK=1
-else
# Make sure bionic is first so we can include system headers.
LOCAL_C_INCLUDES := \
bionic \
external/stlport/stlport \
$(LOCAL_C_INCLUDES)
-endif
@@ -54,26 +54,13 @@
#define _STLP_NO_VENDOR_MATH_L 1
// Define how to include our native headers.
-#ifdef BUILD_WITH_NDK
-
-#define _STLP_NATIVE_HEADER(header) <usr/include/header>
-#define _STLP_NATIVE_C_HEADER(header) <../include/header>
-#define _STLP_NATIVE_CPP_C_HEADER(header) <usr/include/header>
-#define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <usr/include/header>
-#define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <usr/include/header>
-#define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <usr/include/header>
-
-#else
-
#define _STLP_NATIVE_HEADER(header) <libstdc++/include/header>
#define _STLP_NATIVE_C_HEADER(header) <../include/header>
#define _STLP_NATIVE_CPP_C_HEADER(header) <libstdc++/include/header>
#define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <libstdc++/include/header>
#define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <libstdc++/include/header>
#define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <libstdc++/include/header>
-#endif
-
// Include most of the gcc settings.
#include <stl/config/_gcc.h>

0 comments on commit 30865cb

Please sign in to comment.