mupen64plus-ae/mupen64plus-ae-deps
1
0
Fork 0
mirror of https://github.com/mupen64plus-ae/mupen64plus-ae-deps.git synced 2024-11-23 05:19:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix travis build

Browse Source
This commit is contained in:
fzurita 2019-01-12 13:42:03 -05:00
parent 6943740b56
commit da51253358
5 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -3,8 +3,8 @@ android:
components:
- tools
- platform-tools
- build-tools-27.0.3
- android-27
- build-tools-28.0.3
- android-28
- extra-android-m2repository
before_install:

30
app/app.iml
View File

@ -33,20 +33,6 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/GL/GL" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/soundtouch/source/SoundTouch" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/png" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/autofit" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/base" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/cff" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/gzip" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/pshinter" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/psnames" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/raster" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/sfnt" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/smooth" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/truetype" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/png/intel" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/png/arm" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/SDL2/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/SDL2/src/atomic" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/SDL2/src/audio" isTestSource="false" />
@ -77,6 +63,20 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/SDL2/src/timer/unix" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/SDL2/src/video" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/SDL2/src/video/android" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/png" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/soundtouch/source/SoundTouch" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/png/arm" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/autofit" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/base" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/cff" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/gzip" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/pshinter" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/psnames" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/raster" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/sfnt" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/smooth" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/freetype/src/truetype" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp/png/intel" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/release" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/release/processReleaseResources/r" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/release" isTestSource="false" generated="true" />
@ -154,7 +154,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.1" level="project" />

2
app/build.gradle
View File

@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 27
compileSdkVersion 28
buildToolsVersion = '28.0.3'
defaultConfig {

2
junrar/build.gradle
View File

@ -1,7 +1,7 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 27
compileSdkVersion 28
buildToolsVersion '28.0.3'
defaultConfig {

1
junrar/junrar.iml
View File

@ -90,7 +90,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_typedef_file" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_zip" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/consumer_proguard_file" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />