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 
am: 3f1febbedb

Change-Id: I2d145aaeb975dfa6abc34f1d5c4e0e9a5708a8b4
This commit is contained in:
Fabrice de Gans-Riberi
2017-04-11 20:11:40 +00:00
committed by android-build-merger
parent 9688b9b542 3f1febbedb
commit c8fcac116b
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;
}
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(

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
* 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