Skip to content

Commit

Permalink
Additional fixes for android studio support
Browse files Browse the repository at this point in the history
  • Loading branch information
Shelnutt2 committed Dec 21, 2014
1 parent e5066b9 commit 93e1592
Show file tree
Hide file tree
Showing 47 changed files with 32 additions and 6,373 deletions.
3 changes: 2 additions & 1 deletion app/app.iml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 14 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
Expand All @@ -88,7 +89,7 @@
<orderEntry type="library" exported="" name="RootTools-javadoc-3.4" level="project" />
<orderEntry type="library" exported="" name="json_simple-1.1" level="project" />
<orderEntry type="library" exported="" name="RootTools-3.4" level="project" />
<orderEntry type="library" exported="" name="android-support-v13" level="project" />
<orderEntry type="library" exported="" name="support-v13-21.0.0" level="project" />
<orderEntry type="library" exported="" name="dropbox-android-sdk-1.5.3" level="project" />
<orderEntry type="library" exported="" name="android-async-http-1.4.5" level="project" />
</component>
Expand Down
6 changes: 1 addition & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ android {
minSdkVersion 14
targetSdkVersion 14

ndk {
moduleName "libmincrypt"
}
}

buildTypes {
Expand All @@ -23,12 +20,11 @@ android {
}

dependencies {
compile 'com.android.support:support-v4:18.0.0'
compile 'com.android.support:support-v13:21.0.0'
compile 'com.google.android.gms:play-services:+'
compile files('libs/RootTools-3.4.jar')
compile files('libs/RootTools-javadoc-3.4.jar')
compile files('libs/android-async-http-1.4.5.jar')
compile files('libs/android-support-v13.jar')
compile files('libs/dropbox-android-sdk-1.5.3.jar')
compile files('libs/json_simple-1.1.jar')
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--><manifest xmlns:android="http://schemas.android.com/apk/res/android" package="android.support.v13">
<uses-sdk android:minSdkVersion="13"/>
<application/>
</manifest>
Binary file not shown.
Binary file not shown.
12 changes: 12 additions & 0 deletions app/build/intermediates/tmp/dex/debug/inputList.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/home/s.shelnutt/AndroidstudioProjects/FreeGee-app/app/build/intermediates/classes/debug
/home/s.shelnutt/AndroidstudioProjects/FreeGee-app/app/build/intermediates/pre-dexed/debug/internal_impl-21.0.0-22d80fae57450a226aa67387e7e0b9072200706b.jar
/home/s.shelnutt/AndroidstudioProjects/FreeGee-app/app/build/intermediates/pre-dexed/debug/support-annotations-21.0.0-4b1246a750c524481c2f504854994ea0e029605c.jar
/home/s.shelnutt/AndroidstudioProjects/FreeGee-app/app/build/intermediates/pre-dexed/debug/classes-b9a52009ad722a8bda59701d5ed58b666ddd1416.jar
/home/s.shelnutt/AndroidstudioProjects/FreeGee-app/app/build/intermediates/pre-dexed/debug/json_simple-1.1-20e99b4f42e53032bd8db170ff62840dec9abca7.jar
/home/s.shelnutt/AndroidstudioProjects/FreeGee-app/app/build/intermediates/pre-dexed/debug/RootTools-3.4-7ff4d4ca7f681dc15460fa5f16f3807f27e1225f.jar
/home/s.shelnutt/AndroidstudioProjects/FreeGee-app/app/build/intermediates/pre-dexed/debug/dropbox-android-sdk-1.5.3-c88b0a412f6de2be45731e8d061343dce06f0ca4.jar
/home/s.shelnutt/AndroidstudioProjects/FreeGee-app/app/build/intermediates/pre-dexed/debug/android-async-http-1.4.5-19defce6464e5ffd04f79eb9a5277c38701e916a.jar
/home/s.shelnutt/AndroidstudioProjects/FreeGee-app/app/build/intermediates/pre-dexed/debug/internal_impl-21.0.0-b2a8e3a71fa72131a57792d9c60c13a797536838.jar
/home/s.shelnutt/AndroidstudioProjects/FreeGee-app/app/build/intermediates/pre-dexed/debug/RootTools-javadoc-3.4-f360181eb51363bc1c59ddf937a9d0c4bfeb517e.jar
/home/s.shelnutt/AndroidstudioProjects/FreeGee-app/app/build/intermediates/pre-dexed/debug/classes-fb02a311b4e6b2c372c4c98e1b299f6d65b14b8e.jar
/home/s.shelnutt/AndroidstudioProjects/FreeGee-app/app/build/intermediates/pre-dexed/debug/classes-a75a1843820e1bb02ebccb344ae3c07e948eb1e0.jar
34 changes: 0 additions & 34 deletions app/src/main/jni/Android.mk

This file was deleted.

24 changes: 0 additions & 24 deletions app/src/main/jni/edifier/Android.mk

This file was deleted.

84 changes: 0 additions & 84 deletions app/src/main/jni/edifier/common.h

This file was deleted.

31 changes: 0 additions & 31 deletions app/src/main/jni/edifier/edifier.c

This file was deleted.

28 changes: 0 additions & 28 deletions app/src/main/jni/edifier/edifier.h

This file was deleted.

39 changes: 0 additions & 39 deletions app/src/main/jni/edifier/edify/Android.mk

This file was deleted.

Loading

0 comments on commit 93e1592

Please sign in to comment.