missytake/fdroiddata
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'update_osmonitor' into 'master'

Browse source 
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
This commit is contained in:
Boris Kraut 2015-01-10 14:32:05 +00:00
parent 4277b99ce5 d349ae3d97
commit 70bcef9a59
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
metadata/com.eolwral.osmonitor.txt
View file

@ -13,7 +13,8 @@ Description:
* Misc: monitor processor, battery and file system. * Misc: monitor processor, battery and file system.
* Message: check dmesg or logcat in real-time. * Message: check dmesg or logcat in real-time.
[https://github.com/eolwral/OSMonitor/blob/HEAD/CHANGELOG.md Changelog] [https://github.com/eolwral/OSMonitor/blob/HEAD/README.md#change-log Changelog] , [https://github.com/eolwral/OSMonitor/blob/HEAD/CHANGELOG.md Changelog (Old releases)]
. .
Repo Type:git Repo Type:git
@ -157,6 +158,17 @@ Build:3.3.0.5,69
mv libs/mips/osmcore assets/osmcore_mips && \ mv libs/mips/osmcore assets/osmcore_mips && \
mv libs/x86/osmcore assets/osmcore_x86 mv libs/x86/osmcore assets/osmcore_x86
Build:3.3.1.1,71
disable=WIP, dex issues while building
commit=2c025bfbe7e9624849ecc5aefac0fe20363f2e8c
subdir=OSMonitor
srclibs=1:Support/v7/appcompat@android-5.0.2_r1,2:Volley@android-5.0.2_r1,3:ColorPicker-eolwral@788621da0c
prebuild=cp $$SDK$$/extras/android/support/v4/android-support-v4.jar $$Support$$/libs/ && \
echo -e 'java.source=1.7\njava.target=1.7' > $$Support$$/ant.properties && \
cp $$SDK$$/extras/android/support/annotations/android-support-annotations.jar $$Support$$/libs/
buildjni=yes
target=android-21
Maintainer Notes: Maintainer Notes:
Could support additional CPU architectures and lose the scanignore by building Could support additional CPU architectures and lose the scanignore by building
the stuff in /jni and moving the three outputs to /assets. the stuff in /jni and moving the three outputs to /assets.