Update jni file structure

Signed-off-by: Leo Ma <begeekmyfriend@gmail.com>

library/src/main/cpp/Android.mk

+include $(call all-subdir-makefiles)

library/src/main/libenc/jni/Application.mk → library/src/main/cpp/Application.mk

-APP_ABI := armeabi-v7a x86
-APP_PLATFORM := android-19
+APP_ABI := armeabi-v7a x86
+APP_PLATFORM := android-19

library/src/main/libenc/jni/Android.mk → library/src/main/cpp/libenc/Android.mk

 LOCAL_PATH := $(call my-dir)
-############# prebuilt ###############
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libyuv
-
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-    LOCAL_SRC_FILES := libs/armeabi-v7a/libyuv.so
-endif
-
-ifeq ($(TARGET_ARCH_ABI),x86)
-    LOCAL_SRC_FILES := libs/x86/libyuv.so
-endif
-
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libx264
-
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-    LOCAL_SRC_FILES := libs/armeabi-v7a/libx264.a
-endif
-
-ifeq ($(TARGET_ARCH_ABI),x86)
-    LOCAL_SRC_FILES := libs/x86/libx264.a
-endif
-
-include $(PREBUILT_STATIC_LIBRARY)
-
-############# build libenc ###########
 include $(CLEAR_VARS)
 LOCAL_MODULE := libenc
 LOCAL_SRC_FILES := libenc.cc
 LOCAL_CFLAGS    :=
-LOCAL_LDLIBS    := -llog
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/libyuv/jni/include $(LOCAL_PATH)/libx264
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libyuv/include $(LOCAL_PATH)/../libx264
 LOCAL_STATIC_LIBRARIES := libx264
 LOCAL_SHARED_LIBRARIES := libyuv
 LOCAL_DISABLE_FORMAT_STRING_CHECKS := true
 LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
+
 include $(BUILD_SHARED_LIBRARY)

library/src/main/cpp/libx264/Android.mk

+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libx264
+
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+    LOCAL_SRC_FILES := libs/armeabi-v7a/libx264.a
+endif
+
+ifeq ($(TARGET_ARCH_ABI),x86)
+    LOCAL_SRC_FILES := libs/x86/libx264.a
+endif
+
+include $(PREBUILT_STATIC_LIBRARY)

library/src/main/libenc/jni/libx264/android_build_arm64_v8a.sh → library/src/main/cpp/libx264/android_build_arm64_v8a.sh

 #!/bin/sh
-ANDROID_NDK=/home/leoma/MyOSP/android-ndk-r13b
+ANDROID_NDK=$HOME/Android/Sdk/ndk-bundle
 SYSROOT=$ANDROID_NDK/platforms/android-21/arch-arm64
 CROSS_PREFIX=$ANDROID_NDK/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-
 EXTRA_CFLAGS="-march=armv8-a -D__ANDROID__"

library/src/main/libenc/jni/libx264/android_build_armeabi_v7a.sh → library/src/main/cpp/libx264/android_build_armeabi_v7a.sh

 #!/bin/sh
-ANDROID_NDK=/home/leoma/MyOSP/android-ndk-r13b
+ANDROID_NDK=$HOME/Android/Sdk/ndk-bundle
 SYSROOT=$ANDROID_NDK/platforms/android-19/arch-arm
 CROSS_PREFIX=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-
 EXTRA_CFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=neon -D__ANDROID__ -D__ARM_ARCH_7__ -D__ARM_ARCH_7A__"
@@ -23,7 +23,8 @@ PREFIX=`pwd`/libs/armeabi-v7a
         --disable-lavf \
         --disable-ffms \
         --disable-gpac \
-        --disable-lsmash
+        --disable-lsmash \
+        --disable-opencl
 make clean
 make STRIP= -j8 install || exit 1

library/src/main/libenc/jni/libx264/android_build_x86.sh → library/src/main/cpp/libx264/android_build_x86.sh

 #!/bin/sh
-ANDROID_NDK=/home/leoma/MyOSP/android-ndk-r13b
+ANDROID_NDK=$HOME/Android/Sdk/ndk-bundle
 SYSROOT=$ANDROID_NDK/platforms/android-19/arch-x86
 CROSS_PREFIX=$ANDROID_NDK/toolchains/x86-4.9/prebuilt/linux-x86_64/bin/i686-linux-android-
 EXTRA_CFLAGS="-D__ANDROID__ -D__i686__"
@@ -23,7 +23,9 @@ PREFIX=`pwd`/libs/x86
         --disable-lavf \
         --disable-ffms \
         --disable-gpac \
-        --disable-lsmash
+        --disable-lsmash \
+        --disable-opencl \
+        --disable-asm
 make clean
 make STRIP= -j8 install || exit 1

library/src/main/libenc/jni/libx264/common/aarch64/asm-offsets.c → library/src/main/cpp/libx264/common/aarch64/asm-offsets.c

 /*****************************************************************************
  * asm-offsets.c: check asm offsets for aarch64
  *****************************************************************************
- * Copyright (C) 2014-2016 x264 project
+ * Copyright (C) 2014-2017 x264 project
  *
  * Authors: Janne Grunau <janne-x264@jannau.net>
  *

library/src/main/libenc/jni/libx264/common/aarch64/asm-offsets.h → library/src/main/cpp/libx264/common/aarch64/asm-offsets.h

 /*****************************************************************************
  * asm-offsets.h: asm offsets for aarch64
  *****************************************************************************
- * Copyright (C) 2014-2016 x264 project
+ * Copyright (C) 2014-2017 x264 project
  *
  * Authors: Janne Grunau <janne-x264@jannau.net>
  *

library/src/main/libenc/jni/libx264/common/aarch64/asm.S → library/src/main/cpp/libx264/common/aarch64/asm.S

 /*****************************************************************************
  * asm.S: AArch64 utility macros
  *****************************************************************************
- * Copyright (C) 2008-2016 x264 project
+ * Copyright (C) 2008-2017 x264 project
  *
  * Authors: Mans Rullgard <mans@mansr.com>
  *          David Conrad <lessen42@gmail.com>

library/src/main/libenc/jni/libx264/common/aarch64/bitstream-a.S → library/src/main/cpp/libx264/common/aarch64/bitstream-a.S

 /*****************************************************************************
  * bitstream-a.S: aarch64 bitstream functions
  *****************************************************************************
- * Copyright (C) 2014-2016 x264 project
+ * Copyright (C) 2014-2017 x264 project
  *
  * Authors: Janne Grunau <janne-x264@jannau.net>
  *

library/src/main/libenc/jni/libx264/common/aarch64/cabac-a.S → library/src/main/cpp/libx264/common/aarch64/cabac-a.S

 /*****************************************************************************
  * cabac-a.S: aarch64 cabac
  *****************************************************************************
- * Copyright (C) 2014-2016 x264 project
+ * Copyright (C) 2014-2017 x264 project
  *
  * Authors: Janne Grunau <janne-x264@jannau.net>
  *

library/src/main/libenc/jni/libx264/common/aarch64/dct-a.S → library/src/main/cpp/libx264/common/aarch64/dct-a.S

 /****************************************************************************
  * dct-a.S: aarch64 transform and zigzag
  *****************************************************************************
- * Copyright (C) 2009-2016 x264 project
+ * Copyright (C) 2009-2017 x264 project
  *
  * Authors: David Conrad <lessen42@gmail.com>
  *          Janne Grunau <janne-x264@jannau.net>

library/src/main/libenc/jni/libx264/common/aarch64/dct.h → library/src/main/cpp/libx264/common/aarch64/dct.h

 /*****************************************************************************
  * dct.h: aarch64 transform and zigzag
  *****************************************************************************
- * Copyright (C) 2009-2016 x264 project
+ * Copyright (C) 2009-2017 x264 project
  *
  * Authors: David Conrad <lessen42@gmail.com>
  *          Janne Grunau <janne-x264@jannau.net>

library/src/main/libenc/jni/libx264/common/aarch64/deblock-a.S → library/src/main/cpp/libx264/common/aarch64/deblock-a.S

 /*****************************************************************************
  * deblock.S: aarch64 deblocking
  *****************************************************************************
- * Copyright (C) 2009-2016 x264 project
+ * Copyright (C) 2009-2017 x264 project
  *
  * Authors: Mans Rullgard <mans@mansr.com>
  *          Janne Grunau <janne-x264@jannau.net>