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

diff --git a/core/binary.mk b/core/binary.mk
index 7923fbe..1f55b66 100644 (file)
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -343,6 +343,10 @@ all_objects := \
 
 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)