summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Willemsen <dwillemsen@google.com> 2015-09-28 21:36:42 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-09-28 21:36:42 +0000
commitf05de8f3b245ba5d788831e41684668d215968dd (patch)
treefff2aa58a58754dfa6d634b71b13046b42081c7d
parentf370a5b3035766dab1237f74a4439eb2dddeb24b (diff)
parentcd72b8be4653841f34a8d757cf27b055f40105bd (diff)
am cd72b8be: am f21beb12: am 899110f3: Merge "Add exported include dir for libandroid_runtime"
* commit 'cd72b8be4653841f34a8d757cf27b055f40105bd': Add exported include dir for libandroid_runtime
-rw-r--r--core/jni/Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 75da27e25abb..20d00b03092a 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -1,6 +1,5 @@
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
@@ -259,6 +258,9 @@ LOCAL_SHARED_LIBRARIES += \
# <bionic_tls.h> in com_google_android_gles_jni_GLImpl.cpp
LOCAL_C_INCLUDES += bionic/libc/private
+# AndroidRuntime.h depends on nativehelper/jni.h
+LOCAL_EXPORT_C_INCLUDE_DIRS := libnativehelper/include
+
LOCAL_MODULE:= libandroid_runtime
# -Wno-unknown-pragmas: necessary for Clang as the GL bindings need to turn