aapt2: kill off aapt1 testsuite, rebuild from scratch

This commit is contained in:
Connor Tumbleson 2018-02-22 11:15:12 -05:00
parent 200ad0250b
commit 828ba8aef3
93 changed files with 2 additions and 469 deletions

View File

@ -1,5 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="brut.apktool.testapp" platformBuildVersionCode="23" platformBuildVersionName="6.0-2438415">
<uses-feature android:glEsVersion="0x00020000" />
<uses-feature android:glEsVersion="0x00030002" />
</manifest>

View File

@ -9,10 +9,4 @@ packageInfo:
versionInfo:
versionCode: '1'
versionName: '1.0'
compressionType: false
unknownFiles:
hidden.file: '8'
non\u007Fprintable.file: '8'
stored.file: '0'
unk_folder/unknown_file: '8'
lib_bug603/bug603: '8'
compressionType: false

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:fontStyle="normal"
android:fontWeight="400"
android:font="@font/lobster_regular" />
</font-family>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:gravity="@integer/reference_test"
/>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:custom="http://schemas.android.com/apk/res-auto">
<TextView custom:test_attr11="TEST_ONE" />
<TextView custom:test_attr11="TEST_ZERO" />
</LinearLayout>

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android">
<TableLayout android:shrinkColumns="1" />
<TableLayout android:shrinkColumns="\ 2147483647" />
<TableLayout android:shrinkColumns="\ 2147483648" />
<TableLayout android:shrinkColumns="\ 555555555555555555" />
</LinearLayout>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen android:title="test" app:min_value="0.2" app:max_value="5.0" app:default_value="1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res/brut.apktool.testapp" />

View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent">
</LinearLayout>

View File

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:autoSizeTextType="uniform" />

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test1">"Forgot your username or password?\nVisit google.com/accounts/recovery."</string>
<string name="test2">Forgot your username or password?\n.Visit google.com/accounts/recovery</string>
<string name="test3"> (string8) "Forgot your username or password?\nVisit google.com/accounts/recovery."</string>
<string name="test4">Forgot your username or password?\nVisit google.com/accounts/recovery.</string>
<string name="test5">Forgot your username or password?
Visit google.com/accounts/recovery.</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test1">test1</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test1">test1</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test1">test1</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test1">test1</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test1">test1</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test1">test1</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test1">test1</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test1">test1</string>
</resources>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test_formatting1"><a href="http://www.foo.com" style="text-decoration:none;">http://www.foo.com</a></string>
<string name="test_formatting2"><a href="http://www.foo.com" style="text-decoration:none">http://www.foo.com</a></string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test1">test1</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="hello_world">Hello World</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test1">test1</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test1">test1</string>
</resources>

View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<item name="test_anims1" type="anim">@android:anim/bounce_interpolator</item>
<item name="test_anims2" type="anim">@android:anim/cycle_interpolator</item>
<item name="test_anims3" type="anim">@android:anim/decelerate_interpolator</item>
<item name="test_anims4" type="anim">@android:anim/fade_in</item>
<item name="test_anims5" type="anim">@android:anim/fade_out</item>
<item name="test_anims6" type="anim">@android:anim/linear_interpolator</item>
<item name="test_anims7" type="anim">@android:anim/overshoot_interpolator</item>
<item name="test_anims8" type="anim">@android:anim/slide_in_left</item>
<item name="test_anims9" type="anim">@android:anim/slide_out_right</item>
</resources>

View File

@ -1,38 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="test_array1">
<item>TEST1</item>
<item>TEST2</item>
<item>TEST3</item>
<item>%2$s foo %1$d</item>
<item>http://google.com&amp;boo=1&amp;foo=2</item>
<item>&lt;b>Bolded Text&lt;/b></item>
<item>&lt;font size=16 align=middle>Small&lt;/font></item>
</string-array>
<integer-array name="test_array2">
<item>-1</item>
<item>0</item>
<item>1</item>
</integer-array>
<array name="test_array3">
<item></item>
<item>true</item>
<item>TEST</item>
<item>5</item>
<item>5.5</item>
<item>10.0sp</item>
<item>#ff123456</item>
</array>
<string-array name="issue_409">
<item>@string/test1</item>
<item>foo</item>
<item>foo2</item>
</string-array>
<string-array name="issue_677" formatted="false">
<item>category=temp%temp%foo</item>
</string-array>
<string-array name="issue_329">
<item>res/</item>
<item>view/</item>
</string-array>
</resources>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="test_bool1">false</bool>
<bool name="test_bool2">true</bool>
</resources>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="test_color1">#ff123456</color>
<color name="test_color2">@android:color/white</color>
<color name="test_color3">#00000000</color>
</resources>

View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="test_dimen1">10.0dip</dimen>
<dimen name="test_dimen2">10.0sp</dimen>
<dimen name="test_dimen3">10.0pt</dimen>
<dimen name="test_dimen4">10.0px</dimen>
<dimen name="test_dimen5">10.0mm</dimen>
<dimen name="test_dimen6">10.0in</dimen>
</resources>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<item name="test_drawable1" type="drawable">@android:drawable/btn_default</item>
<item name="test_drawable2" type="drawable">#00000000</item>
</resources>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item type="id" name="test_id1" />
<item type="id" name="test_id2" />
</resources>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="test_integer1">-1</integer>
<integer name="test_integer2">0</integer>
<integer name="test_integer3">1</integer>
</resources>

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<item name="test_layouts1" type="layout">@android:layout/activity_list_item</item>
<item name="test_layouts2" type="layout">@android:layout/browser_link_context_header</item>
<item name="test_layouts3" type="layout">@android:layout/simple_list_item_1</item>
<item name="test_layouts4" type="layout">@android:layout/simple_spinner_item</item>
</resources>

View File

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<plurals name="test_plurals1">
<item quantity="other">%1$s, %2$d foo(s)</item>
<item quantity="one">%1$s, %2$d foo</item>
</plurals>
<plurals name="test_plurals2">
<item quantity="other">%d foos</item>
<item quantity="one">%d foo</item>
</plurals>
<plurals name="test_plurals3">
<item quantity="other">foo %d moos</item>
<item quantity="one">foo %d moo</item>
</plurals>
<plurals name="test_plurals4">
<item quantity="other">foo %d</item>
<item quantity="one">foo 1</item>
</plurals>
<plurals name="issue_658">
<item quantity="other">&lt;b>%d&lt;/b> guide123</item>
<item quantity="one">&lt;b>%d&lt;/b> 1</item>
</plurals>
<plurals name="issue_1431">
<item quantity="other">Vous disposez de &lt;font color=#8c593c>%1$d contenus&lt;/font> sur &lt;font color=#8c593c>%2$d disponibles&lt;/font></item>
<item quantity="one">Vous disposez de &lt;font color=#8c593c>%1$d contenu&lt;/font> sur &lt;font color=#8c593c>%2$d disponibles&lt;/font></item>
</plurals>
</resources>

View File

@ -1,44 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test_string1"></string>
<string name="test_string2">Lorem ipsum...</string>
<string name="test_string3">\@</string>
<string name="test_string4">\?</string>
<string name="test_string5">\#ff123456</string>
<string name="test_string7">&amp;</string>
<string name="test_string8">"'"</string>
<string name="test_string9">\"</string>
<string name="test_string10">\u0005</string>
<string name="test_string11">" foo bar "</string>
<string name="test_string12">"foo
bar"</string>
<string name="test_string13">" foo"<b>bar <i> baz </i></b> <u>foo</u></string>
<string name="test_string14">foo<sometag someattr1="someval1" someattr2="someval2">bar</sometag>baz</string>
<string name="test_string16">foo<b>bar<i>"b
az"</i></b>foo</string>
<string name="test_string17" formatted="false">%d of %d</string>
<string name="test_string18" formatted="false">foo %d bar %</string>
<string name="test_string19">%2$s foo %1$d</string>
<string name="test_string20" formatted="false">%-e foo %,d</string>
<string name="test_string21">%2$-e foo %1$,d</string>
<string name="test_string22" formatted="false">%02d foo %01d</string>
<string name="test_string23" formatted="false">%d foo %1</string>
<string name="test_string24" formatted="false">%1% foo %2%</string>
<string name="test_string25" formatted="false">foo %s bar %2$s baz</string>
<string name="test_string26">賞金鬥士14</string>
<string name="test_string27">{id:65538,v:2,tid:20003,mst:1,x:-1,y:-1,a:6000,b:3000,lm:{chp:1000,rep:0,bt:0,mp:[[101,0,1,0],[101,0,1,1],[101,0,1,2],[101,0,1,3],[101,0,1,4],[101,0,1,5],[100,0,0,0],[100,0,0,1],[100,0,0,2],[100,0,0,3],[100,0,0,4],[100,0,0,5]]},rm:{chp:1000,rep:0,bt:0,mp:[[100,0,1,0],[100,0,1,1],[100,0,1,2],[100,0,1,3],[100,0,1,4],[100,0,1,5],[101,0,0,0],[101,0,0,1],[101,0,0,2],[101,0,0,3],[101,0,0,4],[101,0,0,5]]}}</string>
<string name="test_string28">{al:[[180,0,7,0,0,1000],[109,0,5,0,0],[109,0,5,2,0],[109,0,5,4,0],[100,0,3,0,0],[100,0,3,1,0],[100,0,3,2,0],[100,0,3,3,0],[100,0,3,4,0],[100,0,3,5,0],[103,0,1,0,0],[103,0,1,1,0],[103,0,1,2,0],[103,0,1,3,0],[103,0,1,4,0],[103,0,1,5,0],[106,0,2,0,0],[106,0,2,1,0],[106,0,2,2,0],[106,0,2,3,0],[106,0,2,4,0],[106,0,2,5,0],[800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],[850],[950],[900,0],[1000,0,0]],v:4,s:-1575044211,rl:[[180,0,7,0,0,1000],[103,0,0,0,0],[103,0,0,1,0],[103,0,0,2,0],[103,0,0,3,0],[103,0,0,4,0],[103,0,0,5,0],[111,0,3,0,0],[111,0,3,1,0],[111,0,3,2,0],[111,0,3,3,0],[111,0,3,4,0],[111,0,3,5,0],[102,0,4,0,0],[102,0,4,1,0],[102,0,4,2,0],[102,0,4,3,0],[102,0,4,4,0],[102,0,4,5,0],[107,0,5,0,0],[107,0,5,1,0],[107,0,5,2,0],[107,0,5,3,0],[107,0,5,4,0],[107,0,5,5,0],[106,0,2,0,0],[106,0,2,1,0],[106,0,2,2,0],[106,0,2,3,0],[106,0,2,4,0],[106,0,2,5,0],[900],[1000,0,0]],m:[]}</string>
<string name="test_string29" formatted="false">category=temp%temp%foo</string>
<string name="test_string30">res/foo/</string>
<string name="test_string31">res/foo</string>
<string name="test_string32">[<font size="17">TEST STRING</font>]</string>
<string name="test_string33"><font size="17">[TEST STRING]</font></string>
<string name="test_string34">[<font size="17">TEST STRING]</font></string>
<string name="test_string35"><font size="17">[TEST STRING</font>]</string>
<string name="test_string36"><font size="17">TEST STRING</font></string>
<string name="test_string37">[<font size="17">Ţåþ ţö ţýþé þåššŵöŕð one two three]</font></string>
<string name="test_string38">[<font size="17">Ţåþ ţö ţýþé þåššŵöŕð one two three</font>]</string>
<string name="test_string39"><font size="17">[Ţåþ ţö ţýþé þåššŵöŕð one two three</font>]</string>
<string name="test_string40">[<font size="17">]Ţåþ ţö ţýþé þåššŵöŕð one two three</font></string>
<string name="test_string41"><font size="17">[Ţåþ ţö ţýþé þåššŵöŕð one two three]</font></string>
</resources>

View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="TextAppearance" parent="@android:style/TextAppearance" />
<style name="TextAppearance.EditEvent_Label" parent="@style/TextAppearance">
<item name="android:gravity">center_vertical</item>
<item name="android:popupAnimationStyle">@empty</item>
</style>
<style name="TextAppearance.EditEvent_Button" parent="@style/TextAppearance.EditEvent_Label">
<item name="android:textColor">#ff777777</item>
<item name="android:color">?android:dividerVertical</item>
</style>
<style name="Foo.Bar" parent=""/>
<style name="IssueStyle">
<item name="android:color">@null</item>
</style>
</resources>

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="test_array4">
<item>@string/test_string1</item>
<item>@string/test_string2</item>
</string-array>
</resources>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test_reference1">@string/test1</string>
<string name="test_reference2">@android:string/ok</string>
<string name="test_reference3">?android:textStyle</string>
</resources>

View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="test_array4">
<item>3.0in</item>
</string-array>
<string-array name="test_array5">
<item>65.0%</item>
<item>65%</item>
</string-array>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item type="bool" name="test_crossType_str2bool">TEST</item>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item type="integer" name="test_crossType_str2int">TEST</item>
</resources>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item type="string" name="test_crossType_bool2str">true</item>
<item type="string" name="test_crossType_int2str">5</item>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test1">test1</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test1">test1</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test1">test1</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="hello_world">Hello World</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="hello_world">Hello World</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="hello_world">Hello World</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="hello_world">Hello World</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test1">test1</string>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="hello_world">Hello World</string>
</resources>

View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<attr format="integer" name="test_attr1"/>
<attr format="reference" name="test_attr2"/>
<attr format="reference" name="test_attr3"/>
<attr format="string" name="test_attr4"/>
<attr name="test_attr5">
<enum name="out_test" value="0"/>
<enum name="in_test" value="1"/>
</attr>
<attr format="reference" name="test_attr6"/>
<attr format="reference" name="test_attr7"/>
<attr format="reference|color" name="test_attr8"/>
<attr format="color" name="test_attr9"/>
<attr format="boolean" name="test_attr10"/>
<attr name="test_attr11">
<enum name="TEST_ZERO" value="0" />
<enum name="TEST_ONE" value="1" />
</attr>
<attr name="min_value" format="float" />
<attr name="max_value" format="float" />
<attr name="default_value" format="float" />
</resources>

View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="test_integer1">-1</integer>
<integer name="test_integer2">0</integer>
<integer name="test_integer3">1</integer>
<integer name="reference_test">0</integer>
<integer name="issue_1223_1">700</integer>
<integer name="issue_1223_2">@integer/issue_1223_1</integer>
</resources>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<public type="string" name="hello_world" id="0x7f020000" />
</resources>

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test1" />
<string name="hello_world">Hello World</string>
<string name="issue_477">divider</string>
<string name="issue_1123">divider</string>
</resources>

View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<View xmlns:android="http://schemas.android.com/apk/res/android"
test1=""
test2="Lorem ipsum"
test3="\@"
test4="\?"
test5="#ff123456"
test6="\#ff123456"
test7="&amp;"
test8="'"
test9="&quot;"
test10="\u0005"
test11=" foo bar "
test12="foo \n bar"
test15="005"
/>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<View xmlns:android="http://schemas.android.com/apk/res/android"
test1="@string/test1"
test2="@android:string/ok"
test3="?android:textStyle"
/>

View File

@ -1,15 +0,0 @@
.class public LHelloWorld;
.super Ljava/lang/Object;
.method public static main([Ljava/lang/String;)V
.registers 2
sget-object v0, Ljava/lang/System;->out:Ljava/io/PrintStream;
const/high16 v1, 0x7f020000
invoke-virtual {v0, v1}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
return-void
.end method

View File

@ -1,15 +0,0 @@
.class public LHelloDualDexSupport;
.super Ljava/lang/Object;
.method public static main([Ljava/lang/String;)V
.registers 2
sget-object v0, Ljava/lang/System;->out:Ljava/io/PrintStream;
const/high16 v1, 0x7f020000
invoke-virtual {v0, v1}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
return-void
.end method

View File

@ -1 +0,0 @@
https://code.google.com/p/android-apktool/issues/detail?id=603

View File

@ -1 +0,0 @@
This file's name contains a non-printable character.

View File

@ -1 +0,0 @@
I am a hidden file. Put here by a developer to make recompilation difficult.