Merge branch 'master' of http://8.136.234.80:10002/WangYongJun/GameConsole

app/src/main/cpp/frontend/drivers/platform_unix.c

@@ -927,6 +927,26 @@ JNIEXPORT void JNICALL Java_com_retroarch_browser_retroactivity_RetroActivityCom
 JNIEXPORT void JNICALL Java_com_retroarch_browser_retroactivity_RetroActivityCommon_setJoystickBindJoyKeyNative
         (JNIEnv *env, jobject thiz, jint port, jint id, jint joy_key) {
     input_config_binds[port][id].joykey = joy_key;
+    input_config_binds[port][id].joyaxis = AXIS_NONE;
+}
+JNIEXPORT void JNICALL Java_com_retroarch_browser_retroactivity_RetroActivityCommon_setJoystickBindJoyAxisNative
+        (JNIEnv *env, jobject thiz, jint port, jint id, jint joy_axis) {
+    input_config_binds[port][id].joykey = NO_BTN;
+    input_config_binds[port][id].joyaxis = joy_axis;
+}
+JNIEXPORT void JNICALL Java_com_retroarch_browser_retroactivity_RetroActivityCommon_setJoystickBindJoypadNative
+        (JNIEnv *env, jobject thiz, jint port, jintArray jjoy_keys, jintArray jjoy_axiss) {
+    int i;
+    int* cjoyaxiss = (*env)->GetIntArrayElements(env, jjoy_axiss, NULL);
+    int* cjoykeys = (*env)->GetIntArrayElements(env, jjoy_keys, NULL);
+
+    for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; ++i) {
+        input_config_binds[port][i].joykey = cjoykeys[i];
+        input_config_binds[port][i].joyaxis = cjoyaxiss[i];
+    }
+
+    (*env)->ReleaseIntArrayElements(env, jjoy_keys, cjoykeys, 0);
+    (*env)->ReleaseIntArrayElements(env, jjoy_axiss, cjoyaxiss, 0);
 }
 /*
  * Native activity interaction (called from main thread)

app/src/main/java/com/retroarch/browser/retroactivity/RetroActivityCommon.java

@@ -578,7 +578,11 @@ DebugUtil.i(TAG,"onTick"+millisUntilFinished);
   public native void gameDialogClosed();
 
   public native void setJoystickBindValidNative(int port, int id, boolean valid);
+
   public native void setJoystickBindJoyKeyNative(int port, int id, int joyKey);
+  public native void setJoystickBindJoyAxisNative(int port, int id, int joyAxis);
+  public native void setJoystickBindJoypadNative(int port, int[] joyKeys, int[] joyAxiss);
+
 
   /////////////// Private methods ///////////////
   /**