j4a_base: rename from j4a_internal

Author: bbcallen

Makefile

@@ -90,8 +90,8 @@ ifneq ("$<", "jni/j4a/class/.c")
 	$(J4A) $< -o $@
 	@diff test/ref_c/$*.c $@
 	@diff test/ref_c/$*.h jni/j4a/class/$*.h
-	@#@cp $@                 test/ref_c/$*.c
-	@#@cp jni/j4a/class/$*.h test/ref_c/$*.h
+	@#cp $@                 test/ref_c/$*.c
+	@#cp jni/j4a/class/$*.h test/ref_c/$*.h
 endif
 
 test: resettest j4a $(TEST_C_SRCS)

include/j4a/j4a_allclasses.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "j4a/j4a_internal.h"
+#include "j4a/j4a_base.h"
 #include "j4a/class/java/nio/ByteBuffer.h"
 #include "j4a/class/java/util/ArrayList.h"
 #include "j4a/class/android/os/Build.h"

include/j4a/j4a_internal.c include/j4a/j4a_base.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "j4a_internal.h"
+#include "j4a_base.h"
 #include "j4a/class/android/os/Build.h"
 
 /********************

include/j4a/j4a_internal.h include/j4a/j4a_base.h

@@ -28,7 +28,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)
 # $(call import-module,android/cpufeatures)
 
 LOCAL_SRC_FILES += j4a/j4a_allclasses.c
-LOCAL_SRC_FILES += j4a/j4a_internal.c
+LOCAL_SRC_FILES += j4a/j4a_base.c
 LOCAL_SRC_FILES += j4a/class/android/media/AudioTrack.c
 LOCAL_SRC_FILES += j4a/class/android/media/MediaCodec.c
 LOCAL_SRC_FILES += j4a/class/android/media/MediaFormat.c

jni/Android.mk

@@ -63,7 +63,7 @@ void CompilationUnit::do_build(std::ostream &h_os, std::ostream &c_os)
     h_os << "#ifndef " << get_header_macro() << std::endl;
     h_os << "#define " << get_header_macro() << std::endl;
     h_os << std::endl;
-    h_os << "#include \"j4a/j4a_internal.h\"" << std::endl;
+    h_os << "#include \"j4a/j4a_base.h\"" << std::endl;
     h_os << std::endl;
 
     clazz->build_c_func_decl(h_os);

src/ast_compilation_unit.cpp

@@ -23,7 +23,7 @@
 #ifndef J4A__android_media_AudioTrack__H
 #define J4A__android_media_AudioTrack__H
 
-#include "j4a/j4a_internal.h"
+#include "j4a/j4a_base.h"
 
 jobject J4AC_android_media_AudioTrack__AudioTrack(JNIEnv *env, jint streamType, jint sampleRateInHz, jint channelConfig, jint audioFormat, jint bufferSizeInBytes, jint mode);
 jobject J4AC_android_media_AudioTrack__AudioTrack__catchAll(JNIEnv *env, jint streamType, jint sampleRateInHz, jint channelConfig, jint audioFormat, jint bufferSizeInBytes, jint mode);

test/ref_c/android/media/AudioTrack.h

@@ -23,7 +23,7 @@
 #ifndef J4A__android_media_MediaCodec__H
 #define J4A__android_media_MediaCodec__H
 
-#include "j4a/j4a_internal.h"
+#include "j4a/j4a_base.h"
 
 jint J4AC_android_media_MediaCodec__BufferInfo__flags__get(JNIEnv *env, jobject thiz);
 jint J4AC_android_media_MediaCodec__BufferInfo__flags__get__catchAll(JNIEnv *env, jobject thiz);

test/ref_c/android/media/MediaCodec.h

@@ -23,7 +23,7 @@
 #ifndef J4A__android_media_MediaFormat__H
 #define J4A__android_media_MediaFormat__H
 
-#include "j4a/j4a_internal.h"
+#include "j4a/j4a_base.h"
 
 jobject J4AC_android_media_MediaFormat__MediaFormat(JNIEnv *env);
 jobject J4AC_android_media_MediaFormat__MediaFormat__catchAll(JNIEnv *env);

test/ref_c/android/media/MediaFormat.h

@@ -23,7 +23,7 @@
 #ifndef J4A__android_media_PlaybackParams__H
 #define J4A__android_media_PlaybackParams__H
 
-#include "j4a/j4a_internal.h"
+#include "j4a/j4a_base.h"
 
 jobject J4AC_android_media_PlaybackParams__setSpeed(JNIEnv *env, jobject thiz, jfloat speed);
 jobject J4AC_android_media_PlaybackParams__setSpeed__catchAll(JNIEnv *env, jobject thiz, jfloat speed);

test/ref_c/android/media/PlaybackParams.h

@@ -23,7 +23,7 @@
 #ifndef J4A__android_os_Build__H
 #define J4A__android_os_Build__H
 
-#include "j4a/j4a_internal.h"
+#include "j4a/j4a_base.h"
 
 jint J4AC_android_os_Build__VERSION__SDK_INT__get(JNIEnv *env);
 jint J4AC_android_os_Build__VERSION__SDK_INT__get__catchAll(JNIEnv *env);

test/ref_c/android/os/Build.h

@@ -23,7 +23,7 @@
 #ifndef J4A__android_os_Bundle__H
 #define J4A__android_os_Bundle__H
 
-#include "j4a/j4a_internal.h"
+#include "j4a/j4a_base.h"
 
 jobject J4AC_android_os_Bundle__Bundle(JNIEnv *env);
 jobject J4AC_android_os_Bundle__Bundle__catchAll(JNIEnv *env);

test/ref_c/android/os/Bundle.h

@@ -23,7 +23,7 @@
 #ifndef J4A__java_nio_Buffer__H
 #define J4A__java_nio_Buffer__H
 
-#include "j4a/j4a_internal.h"
+#include "j4a/j4a_base.h"
 
 int J4A_loadClass__J4AC_java_nio_Buffer(JNIEnv *env);
 

test/ref_c/java/nio/Buffer.h

@@ -23,7 +23,7 @@
 #ifndef J4A__java_nio_ByteBuffer__H
 #define J4A__java_nio_ByteBuffer__H
 
-#include "j4a/j4a_internal.h"
+#include "j4a/j4a_base.h"
 
 jobject J4AC_java_nio_ByteBuffer__allocate(JNIEnv *env, jint capacity);
 jobject J4AC_java_nio_ByteBuffer__allocate__catchAll(JNIEnv *env, jint capacity);

test/ref_c/java/nio/ByteBuffer.h

@@ -23,7 +23,7 @@
 #ifndef J4A__java_util_ArrayList__H
 #define J4A__java_util_ArrayList__H
 
-#include "j4a/j4a_internal.h"
+#include "j4a/j4a_base.h"
 
 jobject J4AC_java_util_ArrayList__ArrayList(JNIEnv *env);
 jobject J4AC_java_util_ArrayList__ArrayList__catchAll(JNIEnv *env);

test/ref_c/java/util/ArrayList.h

@@ -23,7 +23,7 @@
 #ifndef J4A__tv_danmaku_ijk_media_player_IjkMediaPlayer__H
 #define J4A__tv_danmaku_ijk_media_player_IjkMediaPlayer__H
 
-#include "j4a/j4a_internal.h"
+#include "j4a/j4a_base.h"
 
 jlong J4AC_tv_danmaku_ijk_media_player_IjkMediaPlayer__mNativeMediaPlayer__get(JNIEnv *env, jobject thiz);
 jlong J4AC_tv_danmaku_ijk_media_player_IjkMediaPlayer__mNativeMediaPlayer__get__catchAll(JNIEnv *env, jobject thiz);

test/ref_c/tv/danmaku/ijk/media/player/IjkMediaPlayer.h

@@ -23,7 +23,7 @@
 #ifndef J4A__tv_danmaku_ijk_media_player_misc_IMediaDataSource__H
 #define J4A__tv_danmaku_ijk_media_player_misc_IMediaDataSource__H
 
-#include "j4a/j4a_internal.h"
+#include "j4a/j4a_base.h"
 
 jint J4AC_tv_danmaku_ijk_media_player_misc_IMediaDataSource__readAt(JNIEnv *env, jobject thiz, jlong position, jbyteArray buffer, jint offset, jint size);
 jint J4AC_tv_danmaku_ijk_media_player_misc_IMediaDataSource__readAt__catchAll(JNIEnv *env, jobject thiz, jlong position, jbyteArray buffer, jint offset, jint size);