diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-19 15:57:26 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-19 15:57:26 -0700 |
| commit | c04d92cac93fdbbdc6d104f15f6496d197753e92 (patch) | |
| tree | 8d8e1b83666562d4f28998c4b1e9b2ee5ac2ec44 /core/jni/Android.mk | |
| parent | 901c36e51c052c6f0556b6272bbeaaa3aa716fd8 (diff) | |
| parent | 1a4527ce9449d913e7a60dc3784520006d8955b7 (diff) | |
| download | frameworks_base-c04d92cac93fdbbdc6d104f15f6496d197753e92.zip frameworks_base-c04d92cac93fdbbdc6d104f15f6496d197753e92.tar.gz frameworks_base-c04d92cac93fdbbdc6d104f15f6496d197753e92.tar.bz2 | |
resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aosp
Change-Id: Iee4e93e3a2b049ec5f13166dbbffdd77b301fe5c
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index dbaa4b8..771e286 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -1,5 +1,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS += -DHAVE_CONFIG_H -DKHTML_NO_EXCEPTIONS -DGKWQ_NO_JAVA LOCAL_CFLAGS += -DNO_SUPPORT_JS_BINDING -DQT_NO_WHEELEVENT -DKHTML_NO_XBL @@ -255,9 +256,10 @@ endif 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 +LOCAL_C_INCLUDES += bionic/libc/private ifeq ($(WITH_MALLOC_LEAK_CHECK),true) LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK |