diff options
| author | Ying Wang <wangying@google.com> | 2010-08-04 12:40:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-04 12:40:37 -0700 |
| commit | eb38771b1963f29d9f5eee5c4d949792e2f9f7d1 (patch) | |
| tree | 80a1af916c4e30ae2f9e23d62fa0dc4e657a59ab | |
| parent | 1943f2b18719c3e797c20a4033929245c93b73f6 (diff) | |
| parent | 72c6dc314ed2ecf0bc559d1aef73d01edb053a52 (diff) | |
| download | stlport-eb38771b1963f29d9f5eee5c4d949792e2f9f7d1.tar.gz | |
am 72c6dc31: am 45c4b171: Build static libstlport.
Merge commit '72c6dc314ed2ecf0bc559d1aef73d01edb053a52' into gingerbread-plus-aosp
* commit '72c6dc314ed2ecf0bc559d1aef73d01edb053a52':
Build static libstlport.
| -rwxr-xr-x | Android.mk | 34 |
1 files changed, 28 insertions, 6 deletions
@@ -4,9 +4,7 @@ ifneq ($(TARGET_SIMULATOR),true) LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES += \ +libstlport_src_files := \ src/dll_main.cpp \ src/fstream.cpp \ src/strstream.cpp \ @@ -40,15 +38,39 @@ LOCAL_SRC_FILES += \ src/c_locale.c \ src/cxa.c \ +libstlport_cflags := -D_GNU_SOURCE +libstlport_cppflags := -fuse-cxa-atexit + +########################################## +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(libstlport_src_files) + LOCAL_MODULE := libstlport -LOCAL_CFLAGS := -D_GNU_SOURCE -LOCAL_CPPFLAGS := -fuse-cxa-atexit +LOCAL_CFLAGS := $(libstlport_cflags) +LOCAL_CPPFLAGS := $(libstlport_cppflags) LOCAL_NDK_VERSION := 4 LOCAL_SDK_VERSION := 8 include $(LOCAL_PATH)/libstlport.mk - include $(BUILD_SHARED_LIBRARY) + +########################################## +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(libstlport_src_files) + +LOCAL_MODULE := libstlport_static + +LOCAL_CFLAGS := $(libstlport_cflags) +LOCAL_CPPFLAGS := $(libstlport_cppflags) + +LOCAL_NDK_VERSION := 4 +LOCAL_SDK_VERSION := 8 + +include $(LOCAL_PATH)/libstlport.mk +include $(BUILD_STATIC_LIBRARY) + endif |