summaryrefslogtreecommitdiffstats
path: root/core/jni/Android.mk
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-01-15 16:12:10 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-01-15 16:12:10 -0800
commit9266c558bf1d21ff647525ff99f7dadbca417309 (patch)
tree1630b1ba80f4793caf39d865528e662bdb1037fe /core/jni/Android.mk
parentb798689749c64baba81f02e10cf2157c747d6b46 (diff)
downloadframeworks_base-9266c558bf1d21ff647525ff99f7dadbca417309.zip
frameworks_base-9266c558bf1d21ff647525ff99f7dadbca417309.tar.gz
frameworks_base-9266c558bf1d21ff647525ff99f7dadbca417309.tar.bz2
auto import from //branches/cupcake/...@126645
Diffstat (limited to 'core/jni/Android.mk')
-rw-r--r--core/jni/Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index c074b69..32c3a54 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -119,6 +119,7 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/android/graphics \
$(call include-path-for, bluedroid) \
$(call include-path-for, libhardware)/hardware \
+ $(call include-path-for, libhardware_legacy)/hardware_legacy \
$(LOCAL_PATH)/../../include/ui \
$(LOCAL_PATH)/../../include/utils \
external/skia/include/core \
@@ -147,6 +148,7 @@ LOCAL_SHARED_LIBRARIES := \
libdvm \
libGLES_CM \
libhardware \
+ libhardware_legacy \
libsonivox \
libcrypto \
libssl \
@@ -167,6 +169,9 @@ endif
ifneq ($(TARGET_SIMULATOR),true)
LOCAL_SHARED_LIBRARIES += \
libdl
+ # we need to access the private Bionic header
+ # <bionic_tls.h> in com_google_android_gles_jni_GLImpl.cpp
+ LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private
endif
LOCAL_LDLIBS += -lpthread -ldl