diff options
| author | Jack Palevich <jackpal@google.com> | 2010-01-09 21:54:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-09 21:54:28 -0800 |
| commit | 90ce68a99f8803643d83be963aa0f28fa952a186 (patch) | |
| tree | d2f31a370c677c5c21f997d40245c6127952c207 /opengl/libs/Android.mk | |
| parent | 9c74295fb16da0469304a7c04c471915e28d09bd (diff) | |
| parent | 6d0f6c78037225ef5648d10e45a513a2e7c612b5 (diff) | |
| download | frameworks_base-90ce68a99f8803643d83be963aa0f28fa952a186.zip frameworks_base-90ce68a99f8803643d83be963aa0f28fa952a186.tar.gz frameworks_base-90ce68a99f8803643d83be963aa0f28fa952a186.tar.bz2 | |
am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair
Merge commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5' into eclair-plus-aosp
* commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5':
DO NOT MERGE A library for encoding and decoding ETC1 textures.
Diffstat (limited to 'opengl/libs/Android.mk')
| -rw-r--r-- | opengl/libs/Android.mk | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index 6d20e80..37b9a43 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -120,3 +120,19 @@ ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true) endif include $(BUILD_SHARED_LIBRARY) + +############################################################################### +# Build the ETC1 host static library +# + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + ETC1/etc1.cpp \ +# + +LOCAL_LDLIBS := -lpthread -ldl +LOCAL_MODULE:= libETC1 + +include $(BUILD_HOST_STATIC_LIBRARY) + |