Merge "Don't allow JNI headers for vendors"
diff --git a/core/binary.mk b/core/binary.mk
index 10ce130..6753e18 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1468,7 +1468,8 @@
 
 my_c_includes += $(TOPDIR)$(LOCAL_PATH) $(intermediates) $(generated_sources_dir)
 
-ifndef LOCAL_SDK_VERSION
+# The platform JNI header is for platform modules only.
+ifeq ($(LOCAL_SDK_VERSION)$(LOCAL_USE_VNDK),)
   my_c_includes += $(JNI_H_INCLUDE)
 endif