diff --git a/tools/aapt2/jni/aapt2_jni.cpp b/tools/aapt2/jni/aapt2_jni.cpp index b029b20bcf154..ce3d282e6f9be 100644 --- a/tools/aapt2/jni/aapt2_jni.cpp +++ b/tools/aapt2/jni/aapt2_jni.cpp @@ -77,20 +77,20 @@ static std::vector extract_pieces(const std::vector return pieces; } -JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeCompile( +JNIEXPORT jint JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeCompile( JNIEnv *env, jclass aapt_obj, jobject arguments_obj) { std::vector compile_args_jni = list_to_utfchars(env, arguments_obj); std::vector compile_args = extract_pieces(compile_args_jni); - aapt::Compile(compile_args); + return aapt::Compile(compile_args); } -JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeLink( +JNIEXPORT jint JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeLink( JNIEnv *env, jclass aapt_obj, jobject arguments_obj) { std::vector link_args_jni = list_to_utfchars(env, arguments_obj); std::vector link_args = extract_pieces(link_args_jni); - aapt::Link(link_args); + return aapt::Link(link_args); } JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_ping( diff --git a/tools/aapt2/jni/com_android_tools_aapt2_Aapt2Jni.h b/tools/aapt2/jni/com_android_tools_aapt2_Aapt2Jni.h index 56c3c18e3a1ea..90150b4d731e9 100644 --- a/tools/aapt2/jni/com_android_tools_aapt2_Aapt2Jni.h +++ b/tools/aapt2/jni/com_android_tools_aapt2_Aapt2Jni.h @@ -18,17 +18,17 @@ JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_ping /* * Class: com_android_tools_aapt2_Aapt2Jni * Method: nativeCompile - * Signature: (Ljava/util/List;)V + * Signature: (Ljava/util/List;)I */ -JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeCompile +JNIEXPORT jint JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeCompile (JNIEnv *, jclass, jobject); /* * Class: com_android_tools_aapt2_Aapt2Jni * Method: nativeLink - * Signature: (Ljava/util/List;)V + * Signature: (Ljava/util/List;)I */ -JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeLink +JNIEXPORT jint JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeLink (JNIEnv *, jclass, jobject); #ifdef __cplusplus