Revert "use the android build of jcardsim"

This reverts commit b91da67.
bowb · Sep 26, 2019 · e6a42ef · e6a42ef
1 parent 75779ea
commit e6a42ef
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,6 +7,9 @@
 [submodule "ACardEmulator/app/src/main/external/IsoApplet"]
  path = ACardEmulator/app/src/main/external/IsoApplet
  url = https://github.com/philipWendland/IsoApplet.git
+[submodule "ACardEmulator/app/src/main/external/jcardsim"]
+ path = ACardEmulator/app/src/main/external/jcardsim
+ url = https://github.com/frankmorgner/jcardsim.git
 [submodule "ACardEmulator/app/src/main/external/MuscleApplet"]
  path = ACardEmulator/app/src/main/external/MuscleApplet
  url = https://github.com/martinpaljak/MuscleApplet.git

diff --git a/ACardEmulator/app/build.gradle b/ACardEmulator/app/build.gradle
@@ -17,6 +17,16 @@ android {
  }
  }
  sourceSets {
+ main.java.srcDirs += 'src/main/external/jcardsim/src/main/java'
+ main.java.exclude('**/APDUScriptTool.java')
+ main.java.exclude('**/JavaxSmartCardInterface.java')
+ main.java.exclude('**/CardTerminalSimulator.java')
+ main.java.exclude('**/JCSCard*.java')
+ main.java.exclude('**/JCSTerminal.java')
+ main.java.exclude('**/JCSFactory.java')
+ main.java.exclude('**/CardSimulator.java')
+ main.java.exclude('**/CAD.java')
+ main.java.exclude('**/CardTerminalSimulator.java')
  main.java.srcDirs += 'src/main/external/GidsApplet/src'
  main.java.exclude('**/gidsAppletTests/*.java')
  main.java.srcDirs += 'src/main/external/IsoApplet/src'

diff --git a/ACardEmulator/app/libs/jcardsim-3.0.4-SNAPSHOT-android.jar b/ACardEmulator/app/libs/jcardsim-3.0.4-SNAPSHOT-android.jar
diff --git a/ACardEmulator/app/src/main/external/jcardsim b/ACardEmulator/app/src/main/external/jcardsim