Merge "Don't allow JNI headers for vendors"

2017-07-14 03:34:50 +00:00
parent 80c05c518b b43a52d79d
commit b253e8e854
1 changed files with 2 additions and 1 deletions
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1468,7 +1468,8 @@ my_tracked_src_files :=

 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