Go to file
Boris Kraut 70bcef9a59 Merge branch 'update_osmonitor' into 'master'
com.eolwral.osmonitor: WIP updating to latest version

WIP for updating, currently failes at dex:

```
-dex:
      [dex] input: /home/vagrant/build/com.eolwral.osmonitor/OSMonitor/bin/classes
      [dex] input: /home/vagrant/build/srclib/Support/v7/appcompat/bin/classes.jar
      [dex] input: /home/vagrant/build/srclib/Volley/bin/classes.jar
      [dex] input: /home/vagrant/build/srclib/ColorPicker-eolwral/bin/classes.jar
      [dex] input: /home/vagrant/build/srclib/Support/v7/appcompat/libs/android-support-annotations.jar
      [dex] input: /home/vagrant/build/srclib/Support/v7/appcompat/libs/android-support-v4.jar
      [dex] Pre-Dexing /home/vagrant/build/srclib/Support/v7/appcompat/bin/classes.jar -> classes-674e69e42a67d3430e93afe0e8219849.jar
      [dex] Pre-Dexing /home/vagrant/build/srclib/Volley/bin/classes.jar -> classes-20b882c8330c6decf4702fdb32e886b5.jar
      [dex] Pre-Dexing /home/vagrant/build/srclib/ColorPicker-eolwral/bin/classes.jar -> classes-4b0c3b27ddd66e118bd5ef7cf9e9eded.jar
      [dex] Pre-Dexing /home/vagrant/build/srclib/Support/v7/appcompat/libs/android-support-annotations.jar -> android-support-annotations-7b37c5e078484cb81a46dd498a341a1a.jar
      [dex] Pre-Dexing /home/vagrant/build/srclib/Support/v7/appcompat/libs/android-support-v4.jar -> android-support-v4-e64e754410970a3acdc8989a2c2da936.jar
      [dex] Converting compiled files and external libraries into /home/vagrant/build/com.eolwral.osmonitor/OSMonitor/bin/classes.dex...
       [dx] Merged dex A (487 defs/978.7KiB) with dex B (279 defs/461.8KiB). Result is 766 defs/1793.1KiB. Took 0.5s
       [dx] Merged dex A (766 defs/1793.1KiB) with dex B (70 defs/77.4KiB). Result is 836 defs/2454.0KiB. Took 0.8s
       [dx] Result compacted from 3503.3KiB to 1501.2KiB to save 2002.1KiB
       [dx] Merged dex A (836 defs/2454.0KiB) with dex B (10 defs/28.1KiB). Result is 846 defs/1501.2KiB. Took 0.4s
       [dx]
       [dx] UNEXPECTED TOP-LEVEL EXCEPTION:
       [dx] com.android.dex.DexException: Multiple dex files define Landroid/support/annotation/AnimRes;
       [dx] 	at com.android.dx.merge.DexMerger.readSortableTypes(DexMerger.java:596)
       [dx] 	at com.android.dx.merge.DexMerger.getSortedTypes(DexMerger.java:554)
       [dx] 	at com.android.dx.merge.DexMerger.mergeClassDefs(DexMerger.java:535)
       [dx] Merged dex A (846 defs/1501.2KiB) with dex B (25 defs/3.5KiB). Result is 871 defs/1878.7KiB. Took 0.1s
       [dx] 	at com.android.dx.merge.DexMerger.mergeDexes(DexMerger.java:171)
       [dx] 	at com.android.dx.merge.DexMerger.merge(DexMerger.java:189)
       [dx] 	at com.android.dx.command.dexer.Main.mergeLibraryDexBuffers(Main.java:454)
       [dx] 	at com.android.dx.command.dexer.Main.runMonoDex(Main.java:303)
       [dx] 	at com.android.dx.command.dexer.Main.run(Main.java:246)
       [dx] 	at com.android.dx.command.dexer.Main.main(Main.java:215)
       [dx] 	at com.android.dx.command.Main.main(Main.java:106)
       [dx]

BUILD FAILED
/home/vagrant/android-sdk/tools/ant/build.xml:892: The following error occurred while executing this line:
/home/vagrant/android-sdk/tools/ant/build.xml:894: The following error occurred while executing this line:
/home/vagrant/android-sdk/tools/ant/build.xml:906: The following error occurred while executing this line:
/home/vagrant/android-sdk/tools/ant/build.xml:283: null returned: 2
```

See merge request !464
2015-01-10 14:32:05 +00:00
build
hooks Use full paths when installing hooks, safer strings 2014-05-28 09:26:04 +02:00
metadata Merge branch 'update_osmonitor' into 'master' 2015-01-10 14:32:05 +00:00
srclibs Mizuu: Remove some jars. 2015-01-07 19:51:39 +01:00
stats Stats, etc 2015-01-10 01:16:04 +00:00
tools
.gitignore Add *.apk to .gitignore to ignore apk symlinks 2014-12-30 23:36:02 +01:00
CONTRIBUTING.md Add link to "Apps to update" page. 2014-08-18 00:08:09 +02:00
COPYING
fdroid-icon.png