commit bce4b75fa7801fcb88c6a9ade9465806fe18d441
author Ying Wang <wangying@google.com> Thu Jul 22 15:51:56 2010 -0700
committer Ying Wang <wangying@google.com> Thu Jul 22 15:58:19 2010 -0700
tree 1cf550f28318da4b1918e4bbf0cfbb28d69da2bc
parent d5c217aca18726f0ed9f2ea034f750620d4bdf7d

Add JNI_H_INCLUDE as default header search path

So that module Android.mk does not need to include it manually.
Also with this change, CL like https://android-git.corp.google.com/g/57887 is not needed.

Change-Id: I68fa73a00c76eb37a8142f35d7eeef79cf53c09b

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 7923fbe1..1f55b66 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -343,6 +343,10 @@
 
 LOCAL_C_INCLUDES += $(TOPDIR)$(LOCAL_PATH) $(intermediates) $(base_intermediates)
 
+ifndef LOCAL_NDK_VERSION
+  LOCAL_C_INCLUDES += $(JNI_H_INCLUDE)
+endif
+
 $(all_objects) : | $(LOCAL_GENERATED_SOURCES)
 ALL_C_CPP_ETC_OBJECTS += $(all_objects)