diff --git a/AndroidMP3RecorderLibrary/.classpath b/AndroidMP3RecorderLibrary/.classpath deleted file mode 100644 index 5176974..0000000 --- a/AndroidMP3RecorderLibrary/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/AndroidMP3RecorderLibrary/.project b/AndroidMP3RecorderLibrary/.project deleted file mode 100644 index 7a215ac..0000000 --- a/AndroidMP3RecorderLibrary/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - AndroidMP3RecorderLibrary - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/AndroidMP3RecorderLibrary/.settings/org.eclipse.core.resources.prefs b/AndroidMP3RecorderLibrary/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/AndroidMP3RecorderLibrary/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/AndroidMP3RecorderLibrary/build.gradle b/AndroidMP3RecorderLibrary/build.gradle new file mode 100644 index 0000000..b519f2a --- /dev/null +++ b/AndroidMP3RecorderLibrary/build.gradle @@ -0,0 +1,26 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion 21 + buildToolsVersion "21.1.2" + + defaultConfig { + minSdkVersion 9 + targetSdkVersion 21 +//暂时屏蔽,等AndroidStudio NDK开发完善后再放开 +// ndk { +// moduleName "mp3lame" +// } + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } +} + +dependencies { + compile 'com.android.support:support-v4:21.0.3' +} diff --git a/AndroidMP3RecorderLibrary/libs/android-support-v4.jar b/AndroidMP3RecorderLibrary/libs/android-support-v4.jar deleted file mode 100644 index c31cede..0000000 Binary files a/AndroidMP3RecorderLibrary/libs/android-support-v4.jar and /dev/null differ diff --git a/AndroidMP3RecorderLibrary/proguard-project.txt b/AndroidMP3RecorderLibrary/proguard-project.txt deleted file mode 100644 index f2fe155..0000000 --- a/AndroidMP3RecorderLibrary/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/AndroidMP3RecorderLibrary/project.properties b/AndroidMP3RecorderLibrary/project.properties deleted file mode 100644 index 93c8c3c..0000000 --- a/AndroidMP3RecorderLibrary/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-21 -android.library=true diff --git a/AndroidMP3RecorderLibrary/AndroidManifest.xml b/AndroidMP3RecorderLibrary/src/main/AndroidManifest.xml similarity index 100% rename from AndroidMP3RecorderLibrary/AndroidManifest.xml rename to AndroidMP3RecorderLibrary/src/main/AndroidManifest.xml diff --git a/AndroidMP3RecorderLibrary/src/com/czt/mp3recorder/DataEncodeThread.java b/AndroidMP3RecorderLibrary/src/main/java/com/czt/mp3recorder/DataEncodeThread.java similarity index 100% rename from AndroidMP3RecorderLibrary/src/com/czt/mp3recorder/DataEncodeThread.java rename to AndroidMP3RecorderLibrary/src/main/java/com/czt/mp3recorder/DataEncodeThread.java diff --git a/AndroidMP3RecorderLibrary/src/com/czt/mp3recorder/MP3Recorder.java b/AndroidMP3RecorderLibrary/src/main/java/com/czt/mp3recorder/MP3Recorder.java similarity index 100% rename from AndroidMP3RecorderLibrary/src/com/czt/mp3recorder/MP3Recorder.java rename to AndroidMP3RecorderLibrary/src/main/java/com/czt/mp3recorder/MP3Recorder.java diff --git a/AndroidMP3RecorderLibrary/src/com/czt/mp3recorder/PCMFormat.java b/AndroidMP3RecorderLibrary/src/main/java/com/czt/mp3recorder/PCMFormat.java similarity index 100% rename from AndroidMP3RecorderLibrary/src/com/czt/mp3recorder/PCMFormat.java rename to AndroidMP3RecorderLibrary/src/main/java/com/czt/mp3recorder/PCMFormat.java diff --git a/AndroidMP3RecorderLibrary/src/com/czt/mp3recorder/util/LameUtil.java b/AndroidMP3RecorderLibrary/src/main/java/com/czt/mp3recorder/util/LameUtil.java similarity index 100% rename from AndroidMP3RecorderLibrary/src/com/czt/mp3recorder/util/LameUtil.java rename to AndroidMP3RecorderLibrary/src/main/java/com/czt/mp3recorder/util/LameUtil.java diff --git a/AndroidMP3RecorderLibrary/jni/Android.mk b/AndroidMP3RecorderLibrary/src/main/jni1/Android.mk similarity index 100% rename from AndroidMP3RecorderLibrary/jni/Android.mk rename to AndroidMP3RecorderLibrary/src/main/jni1/Android.mk diff --git a/AndroidMP3RecorderLibrary/jni/Application.mk b/AndroidMP3RecorderLibrary/src/main/jni1/Application.mk similarity index 100% rename from AndroidMP3RecorderLibrary/jni/Application.mk rename to AndroidMP3RecorderLibrary/src/main/jni1/Application.mk diff --git a/AndroidMP3RecorderLibrary/jni/com_czt_mp3recorder_util_LameUtil.h b/AndroidMP3RecorderLibrary/src/main/jni1/com_czt_mp3recorder_util_LameUtil.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/com_czt_mp3recorder_util_LameUtil.h rename to AndroidMP3RecorderLibrary/src/main/jni1/com_czt_mp3recorder_util_LameUtil.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/VbrTag.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/VbrTag.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/VbrTag.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/VbrTag.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/VbrTag.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/VbrTag.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/VbrTag.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/VbrTag.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/bitstream.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/bitstream.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/bitstream.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/bitstream.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/bitstream.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/bitstream.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/bitstream.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/bitstream.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/encoder.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/encoder.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/encoder.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/encoder.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/encoder.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/encoder.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/encoder.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/encoder.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/fft.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/fft.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/fft.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/fft.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/fft.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/fft.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/fft.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/fft.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/gain_analysis.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/gain_analysis.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/gain_analysis.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/gain_analysis.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/gain_analysis.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/gain_analysis.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/gain_analysis.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/gain_analysis.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/i386/nasm.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/i386/nasm.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/i386/nasm.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/i386/nasm.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/id3tag.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/id3tag.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/id3tag.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/id3tag.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/id3tag.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/id3tag.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/id3tag.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/id3tag.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/l3side.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/l3side.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/l3side.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/l3side.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/lame-analysis.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/lame-analysis.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/lame-analysis.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/lame-analysis.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/lame.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/lame.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/lame.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/lame.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/lame.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/lame.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/lame.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/lame.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/lame_global_flags.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/lame_global_flags.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/lame_global_flags.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/lame_global_flags.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/lameerror.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/lameerror.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/lameerror.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/lameerror.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/machine.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/machine.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/machine.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/machine.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/mpglib_interface.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/mpglib_interface.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/mpglib_interface.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/mpglib_interface.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/newmdct.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/newmdct.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/newmdct.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/newmdct.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/newmdct.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/newmdct.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/newmdct.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/newmdct.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/presets.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/presets.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/presets.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/presets.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/psymodel.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/psymodel.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/psymodel.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/psymodel.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/psymodel.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/psymodel.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/psymodel.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/psymodel.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/quantize.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/quantize.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/quantize.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/quantize.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/quantize.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/quantize.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/quantize.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/quantize.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/quantize_pvt.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/quantize_pvt.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/quantize_pvt.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/quantize_pvt.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/quantize_pvt.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/quantize_pvt.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/quantize_pvt.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/quantize_pvt.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/reservoir.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/reservoir.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/reservoir.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/reservoir.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/reservoir.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/reservoir.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/reservoir.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/reservoir.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/set_get.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/set_get.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/set_get.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/set_get.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/set_get.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/set_get.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/set_get.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/set_get.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/tables.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/tables.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/tables.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/tables.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/tables.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/tables.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/tables.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/tables.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/takehiro.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/takehiro.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/takehiro.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/takehiro.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/util.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/util.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/util.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/util.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/util.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/util.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/util.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/util.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/vbrquantize.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/vbrquantize.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/vbrquantize.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/vbrquantize.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/vbrquantize.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/vbrquantize.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/vbrquantize.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/vbrquantize.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/vector/lame_intrin.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/vector/lame_intrin.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/vector/lame_intrin.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/vector/lame_intrin.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/vector/xmm_quantize_sub.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/vector/xmm_quantize_sub.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/vector/xmm_quantize_sub.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/vector/xmm_quantize_sub.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/version.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/version.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/version.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/version.c diff --git a/AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/version.h b/AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/version.h similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_3.99.5_libmp3lame/version.h rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_3.99.5_libmp3lame/version.h diff --git a/AndroidMP3RecorderLibrary/jni/lame_util.c b/AndroidMP3RecorderLibrary/src/main/jni1/lame_util.c similarity index 100% rename from AndroidMP3RecorderLibrary/jni/lame_util.c rename to AndroidMP3RecorderLibrary/src/main/jni1/lame_util.c diff --git a/AndroidMP3RecorderLibrary/libs/armeabi-v7a/libmp3lame.so b/AndroidMP3RecorderLibrary/src/main/jniLibs/armeabi-v7a/libmp3lame.so similarity index 100% rename from AndroidMP3RecorderLibrary/libs/armeabi-v7a/libmp3lame.so rename to AndroidMP3RecorderLibrary/src/main/jniLibs/armeabi-v7a/libmp3lame.so diff --git a/AndroidMP3RecorderLibrary/libs/armeabi/libmp3lame.so b/AndroidMP3RecorderLibrary/src/main/jniLibs/armeabi/libmp3lame.so similarity index 100% rename from AndroidMP3RecorderLibrary/libs/armeabi/libmp3lame.so rename to AndroidMP3RecorderLibrary/src/main/jniLibs/armeabi/libmp3lame.so diff --git a/AndroidMP3RecorderLibrary/libs/x86/libmp3lame.so b/AndroidMP3RecorderLibrary/src/main/jniLibs/x86/libmp3lame.so similarity index 100% rename from AndroidMP3RecorderLibrary/libs/x86/libmp3lame.so rename to AndroidMP3RecorderLibrary/src/main/jniLibs/x86/libmp3lame.so diff --git a/AndroidMP3RecorderLibrary/res/values/strings.xml b/AndroidMP3RecorderLibrary/src/main/res/values/strings.xml similarity index 100% rename from AndroidMP3RecorderLibrary/res/values/strings.xml rename to AndroidMP3RecorderLibrary/src/main/res/values/strings.xml diff --git a/AndroidMP3RecorderSample/.classpath b/AndroidMP3RecorderSample/.classpath deleted file mode 100644 index 5176974..0000000 --- a/AndroidMP3RecorderSample/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/AndroidMP3RecorderSample/.project b/AndroidMP3RecorderSample/.project deleted file mode 100644 index 5174f28..0000000 --- a/AndroidMP3RecorderSample/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - AndroidMP3RecorderSample - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/AndroidMP3RecorderSample/.settings/org.eclipse.core.resources.prefs b/AndroidMP3RecorderSample/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/AndroidMP3RecorderSample/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/AndroidMP3RecorderSample/build.gradle b/AndroidMP3RecorderSample/build.gradle new file mode 100644 index 0000000..9fe8a88 --- /dev/null +++ b/AndroidMP3RecorderSample/build.gradle @@ -0,0 +1,24 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 21 + buildToolsVersion "21.1.2" + + defaultConfig { + applicationId "com.czt.mp3recorder.sample" + minSdkVersion 11 + targetSdkVersion 21 + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } +} + +dependencies { + compile project(':AndroidMP3RecorderLibrary') + compile 'com.android.support:support-v4:21.0.3' +} diff --git a/AndroidMP3RecorderSample/libs/android-support-v4.jar b/AndroidMP3RecorderSample/libs/android-support-v4.jar deleted file mode 100644 index c31cede..0000000 Binary files a/AndroidMP3RecorderSample/libs/android-support-v4.jar and /dev/null differ diff --git a/AndroidMP3RecorderSample/proguard-project.txt b/AndroidMP3RecorderSample/proguard-project.txt deleted file mode 100644 index f2fe155..0000000 --- a/AndroidMP3RecorderSample/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/AndroidMP3RecorderSample/project.properties b/AndroidMP3RecorderSample/project.properties deleted file mode 100644 index 888961c..0000000 --- a/AndroidMP3RecorderSample/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-21 -android.library.reference.1=../AndroidMP3RecorderLibrary diff --git a/AndroidMP3RecorderSample/AndroidManifest.xml b/AndroidMP3RecorderSample/src/main/AndroidManifest.xml similarity index 100% rename from AndroidMP3RecorderSample/AndroidManifest.xml rename to AndroidMP3RecorderSample/src/main/AndroidManifest.xml diff --git a/AndroidMP3RecorderSample/src/com/czt/mp3recorder/sample/MainActivity.java b/AndroidMP3RecorderSample/src/main/java/com/czt/mp3recorder/sample/MainActivity.java similarity index 100% rename from AndroidMP3RecorderSample/src/com/czt/mp3recorder/sample/MainActivity.java rename to AndroidMP3RecorderSample/src/main/java/com/czt/mp3recorder/sample/MainActivity.java diff --git a/AndroidMP3RecorderSample/res/drawable-hdpi/ic_launcher.png b/AndroidMP3RecorderSample/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from AndroidMP3RecorderSample/res/drawable-hdpi/ic_launcher.png rename to AndroidMP3RecorderSample/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/AndroidMP3RecorderSample/res/drawable-mdpi/ic_launcher.png b/AndroidMP3RecorderSample/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from AndroidMP3RecorderSample/res/drawable-mdpi/ic_launcher.png rename to AndroidMP3RecorderSample/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/AndroidMP3RecorderSample/res/drawable-xhdpi/ic_launcher.png b/AndroidMP3RecorderSample/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from AndroidMP3RecorderSample/res/drawable-xhdpi/ic_launcher.png rename to AndroidMP3RecorderSample/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/AndroidMP3RecorderSample/res/drawable-xxhdpi/ic_launcher.png b/AndroidMP3RecorderSample/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from AndroidMP3RecorderSample/res/drawable-xxhdpi/ic_launcher.png rename to AndroidMP3RecorderSample/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/AndroidMP3RecorderSample/res/layout/main.xml b/AndroidMP3RecorderSample/src/main/res/layout/main.xml similarity index 100% rename from AndroidMP3RecorderSample/res/layout/main.xml rename to AndroidMP3RecorderSample/src/main/res/layout/main.xml diff --git a/AndroidMP3RecorderSample/res/values/strings.xml b/AndroidMP3RecorderSample/src/main/res/values/strings.xml similarity index 100% rename from AndroidMP3RecorderSample/res/values/strings.xml rename to AndroidMP3RecorderSample/src/main/res/values/strings.xml diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..833eee9 --- /dev/null +++ b/build.gradle @@ -0,0 +1,15 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.1.0' + } +} + +allprojects { + repositories { + jcenter() + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..8c0fb64 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..0c71e76 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Apr 10 15:27:10 PDT 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..91a7e26 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/import-summary.txt b/import-summary.txt new file mode 100644 index 0000000..e362664 --- /dev/null +++ b/import-summary.txt @@ -0,0 +1,64 @@ +ECLIPSE ANDROID PROJECT IMPORT SUMMARY +====================================== + +Manifest Merging: +----------------- +Your project uses libraries that provide manifests, and your Eclipse +project did not explicitly turn on manifest merging. In Android Gradle +projects, manifests are always merged (meaning that contents from your +libraries' manifests will be merged into the app manifest. If you had +manually copied contents from library manifests into your app manifest +you may need to remove these for the app to build correctly. + +Ignored Files: +-------------- +The following files were *not* copied into the new Gradle project; you +should evaluate whether these are still needed in your project and if +so manually move them: + +From AndroidMP3RecorderLibrary: +* proguard-project.txt +From AndroidMP3RecorderSample: +* proguard-project.txt + +Replaced Jars with Dependencies: +-------------------------------- +The importer recognized the following .jar files as third party +libraries and replaced them with Gradle dependencies instead. This has +the advantage that more explicit version information is known, and the +libraries can be updated automatically. However, it is possible that +the .jar file in your project was of an older version than the +dependency we picked, which could render the project not compileable. +You can disable the jar replacement in the import wizard and try again: + +android-support-v4.jar => com.android.support:support-v4:21.0.3 + +Moved Files: +------------ +Android Gradle projects use a different directory structure than ADT +Eclipse projects. Here's how the projects were restructured: + +In AndroidMP3RecorderLibrary: +* AndroidManifest.xml => AndroidMP3RecorderLibrary\src\main\AndroidManifest.xml +* jni\ => AndroidMP3RecorderLibrary\src\main\jni\ +* res\ => AndroidMP3RecorderLibrary\src\main\res\ +* src\ => AndroidMP3RecorderLibrary\src\main\java\ +In AndroidMP3RecorderSample: +* AndroidManifest.xml => AndroidMP3RecorderSample\src\main\AndroidManifest.xml +* res\ => AndroidMP3RecorderSample\src\main\res\ +* src\ => AndroidMP3RecorderSample\src\main\java\ + +Next Steps: +----------- +You can now build the project. The Gradle project needs network +connectivity to download dependencies. + +Bugs: +----- +If for some reason your project does not build, and you determine that +it is due to a bug or limitation of the Eclipse to Gradle importer, +please file a bug at http://b.android.com with category +Component-Tools. + +(This import summary is for your information only, and can be deleted +after import once you are satisfied with the results.) diff --git a/libs.zip b/libs.zip deleted file mode 100644 index 0a17c92..0000000 Binary files a/libs.zip and /dev/null differ diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..2d32f6d --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +include ':AndroidMP3RecorderLibrary' +include ':AndroidMP3RecorderSample'