Merge "Renamed Aapt2.java to Aapt2Jni.java."

This commit is contained in:
Paulo Casanova
2016-11-04 18:47:21 +00:00
committed by Android (Google) Code Review
3 changed files with 41 additions and 41 deletions

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "com_android_tools_aapt2_Aapt2.h"
#include "com_android_tools_aapt2_Aapt2Jni.h"
#include <algorithm>
#include <memory>
@@ -76,7 +76,7 @@ static std::vector<aapt::StringPiece> extract_pieces(
return pieces;
}
JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2_nativeCompile(
JNIEXPORT void 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);
@@ -85,7 +85,7 @@ JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2_nativeCompile(
aapt::Compile(compile_args);
}
JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2_nativeLink(
JNIEXPORT void 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);
@@ -93,7 +93,7 @@ JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2_nativeLink(
aapt::Link(link_args);
}
JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2_ping(
JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_ping(
JNIEnv *env, jclass aapt_obj) {
// This is just a dummy method to see if the library has been loaded.
}

View File

@@ -1,37 +0,0 @@
/* DO NOT EDIT THIS FILE - it is machine generated */
#include <jni.h>
/* Header for class com_android_tools_aapt2_Aapt2 */
#ifndef _Included_com_android_tools_aapt2_Aapt2
#define _Included_com_android_tools_aapt2_Aapt2
#ifdef __cplusplus
extern "C" {
#endif
/*
* Class: com_android_tools_aapt2_Aapt2
* Method: ping
* Signature: ()V
*/
JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2_ping
(JNIEnv *, jclass);
/*
* Class: com_android_tools_aapt2_Aapt2
* Method: nativeCompile
* Signature: (Ljava/util/List;)V
*/
JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2_nativeCompile
(JNIEnv *, jclass, jobject);
/*
* Class: com_android_tools_aapt2_Aapt2
* Method: nativeLink
* Signature: (Ljava/util/List;)V
*/
JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2_nativeLink
(JNIEnv *, jclass, jobject);
#ifdef __cplusplus
}
#endif
#endif

View File

@@ -0,0 +1,37 @@
/* DO NOT EDIT THIS FILE - it is machine generated */
#include <jni.h>
/* Header for class com_android_tools_aapt2_Aapt2Jni */
#ifndef _Included_com_android_tools_aapt2_Aapt2Jni
#define _Included_com_android_tools_aapt2_Aapt2Jni
#ifdef __cplusplus
extern "C" {
#endif
/*
* Class: com_android_tools_aapt2_Aapt2Jni
* Method: ping
* Signature: ()V
*/
JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_ping
(JNIEnv *, jclass);
/*
* Class: com_android_tools_aapt2_Aapt2Jni
* Method: nativeCompile
* Signature: (Ljava/util/List;)V
*/
JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeCompile
(JNIEnv *, jclass, jobject);
/*
* Class: com_android_tools_aapt2_Aapt2Jni
* Method: nativeLink
* Signature: (Ljava/util/List;)V
*/
JNIEXPORT void JNICALL Java_com_android_tools_aapt2_Aapt2Jni_nativeLink
(JNIEnv *, jclass, jobject);
#ifdef __cplusplus
}
#endif
#endif