Fix ARCCore Qualcomm API dependency

Andover-Robotics · Apr 12, 2018 · c40072e · c40072e
1 parent 59c64a5
commit c40072e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/ARCCore/ARCCore.iml b/ARCCore/ARCCore.iml
@@ -78,17 +78,27 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="Gradle: FtcCommon-release:@aar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: Blocks-release:@aar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: RobotCore-release:@aar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: Inspection-release:@aar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: Analytics-release:@aar" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: WirelessP2p-release:@aar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: Hardware-release:@aar" level="project" />
+    <orderEntry type="module" module-name="FtcRobotController" exported="" />
   </component>
 </module>
diff --git a/ARCCore/build.gradle b/ARCCore/build.gradle
@@ -21,11 +21,21 @@ android {
 }
 
 repositories {
+    flatDir {
+        dirs '../libs'
+    }
+
     mavenCentral()
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
+    compile project(':FtcRobotController')
+    compile (name: 'RobotCore-release', ext: 'aar')
+    compile (name: 'Hardware-release', ext: 'aar')
+    compile (name: 'FtcCommon-release', ext: 'aar')
+    compile (name:'Analytics-release', ext:'aar')
+    compile (name:'WirelessP2p-release', ext:'aar')
 
+    testCompile 'junit:junit:4.12'
 }
+