Skip to content

Commit 759051e

Browse files
nokiaMSgithubgxll
authored andcommitted
[fix][compile] Fix issue that jni can not be compiled in java17 as javah is disused.
1 parent c6015c9 commit 759051e

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

jni/src/main/cpp/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,11 @@ if(DEFINED ENV{JAVA_HOME})
4646
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
4747
include_directories(${JAVA_HOME}/include/linux)
4848
endif()
49-
set(JNI_HEADER libexpr_jni.h)
49+
set(JNI_HEADER io_dingodb_expr_jni_LibExprJni.h)
5050
set(JNI_LIB_NAME expr_jni)
5151
add_custom_command(
5252
OUTPUT ${JNI_HEADER}
53-
COMMAND javah -cp ${CMAKE_SOURCE_DIR}/../java -o ${JNI_HEADER} io.dingodb.expr.jni.LibExprJni
54-
DEPENDS ${CMAKE_SOURCE_DIR}/../java/io/dingodb/expr/jni/LibExprJni.java
53+
COMMAND javac -h ./ ${CMAKE_SOURCE_DIR}/../java/io/dingodb/expr/jni/LibExprJni.java
5554
)
5655
add_library(${JNI_LIB_NAME} SHARED libexpr_jni.cc ${JNI_HEADER})
5756
target_include_directories(${JNI_LIB_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

jni/src/main/cpp/libexpr_jni.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "libexpr_jni.h"
15+
#include "io_dingodb_expr_jni_LibExprJni.h"
1616

1717
#include <jni.h>
1818

0 commit comments

Comments
 (0)