Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f1febbe authored by Fabrice de Gans-Riberi's avatar Fabrice de Gans-Riberi Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: expose return values through JNI." into oc-dev

parents 2d7d617e 014d3156

tools/aapt2/jni/aapt2_jni.cpp

+4 −4
Original line number Diff line number Diff line
@@ -77,20 +77,20 @@ static std::vector<StringPiece> extract_pieces(const std::vector<ScopedUtfChars> 
  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<ScopedUtfChars> compile_args_jni =

      list_to_utfchars(env, arguments_obj);

  std::vector<StringPiece> 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<ScopedUtfChars> link_args_jni =

      list_to_utfchars(env, arguments_obj);

  std::vector<StringPiece> 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(

tools/aapt2/jni/com_android_tools_aapt2_Aapt2Jni.h

+4 −4
Original line number Diff line number Diff line
@@ -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