diff options
| author | Ying Wang <wangying@google.com> | 2012-08-13 18:40:57 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-08-14 11:58:44 -0700 |
| commit | 30865cb901602ed078ff2ed534529d847b3b54b5 (patch) | |
| tree | f80189072577fb0bc21516ec164c68ee98366014 | |
| parent | 4c86b6ec1a905e46f2a575ac0851ec5f153a4acf (diff) | |
| download | stlport-30865cb901602ed078ff2ed534529d847b3b54b5.tar.gz | |
Revert "Unbundle libstlport with NDK r4."android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1.1-releasejb-mr1.1-devjb-mr1-releasejb-mr1-dev
This reverts commit f581c1eaf398e25de8ecae69c46c698604b288f0.
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
| -rwxr-xr-x | Android.mk | 10 | ||||
| -rw-r--r-- | libstlport.mk | 10 | ||||
| -rw-r--r-- | stlport/stl/config/_android.h | 13 |
3 files changed, 0 insertions, 33 deletions
@@ -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) diff --git a/libstlport.mk b/libstlport.mk index 8c726f8..571e769 100644 --- a/libstlport.mk +++ b/libstlport.mk @@ -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 diff --git a/stlport/stl/config/_android.h b/stlport/stl/config/_android.h index d342ada..59ed525 100644 --- a/stlport/stl/config/_android.h +++ b/stlport/stl/config/_android.h @@ -54,17 +54,6 @@ #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> @@ -72,8 +61,6 @@ #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> |