Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fabrice de Gans-Riberi
2017-04-11 19:56:15 +00:00
committed by Android (Google) Code Review
parent 2d7d617e6a 014d315653
commit 3f1febbedb
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/aapt2/jni/aapt2_jni.cpp
View File

@@ -77,20 +77,20 @@ static std::vector<StringPiece> extract_pieces(const std::vector<ScopedUtfChars>
return pieces; 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) { JNIEnv *env, jclass aapt_obj, jobject arguments_obj) {
std::vector<ScopedUtfChars> compile_args_jni = std::vector<ScopedUtfChars> compile_args_jni =
list_to_utfchars(env, arguments_obj); list_to_utfchars(env, arguments_obj);
std::vector<StringPiece> compile_args = extract_pieces(compile_args_jni); 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) { JNIEnv *env, jclass aapt_obj, jobject arguments_obj) {
std::vector<ScopedUtfChars> link_args_jni = std::vector<ScopedUtfChars> link_args_jni =
list_to_utfchars(env, arguments_obj); list_to_utfchars(env, arguments_obj);
std::vector<StringPiece> link_args = extract_pieces(link_args_jni); 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( JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_ping(

8
tools/aapt2/jni/com_android_tools_aapt2_Aapt2Jni.h
View File

@@ -18,17 +18,17 @@ JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_ping
/* /*
* Class: com_android_tools_aapt2_Aapt2Jni * Class: com_android_tools_aapt2_Aapt2Jni
* Method: nativeCompile * 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); (JNIEnv *, jclass, jobject);
/* /*
* Class: com_android_tools_aapt2_Aapt2Jni * Class: com_android_tools_aapt2_Aapt2Jni
* Method: nativeLink * 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); (JNIEnv *, jclass, jobject);
#ifdef __cplusplus #ifdef __cplusplus