summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge "Check tests.config is set before running tests" into ub-jackJean-Marie Henaff2015-02-191-27/+29
|\ \ \
| * | | Check tests.config is set before running testsJean-Marie Henaff2015-02-191-27/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rename property holding the path used to generate the report. Change-Id: Icb8378742bbcc4090bf5844289db15248da68296
* | | | Merge "Reduce memory consumes by CstString into Jack merger" into ub-jackmikaelpeltier2015-02-191-8/+13
|\ \ \ \ | |_|/ / |/| | |
| * | | Reduce memory consumes by CstString into Jack mergermikaelpeltier2015-02-191-8/+13
| | | | | | | | | | | | | | | | Change-Id: I338733ce0286c609304f8d39fb3ce598b6fa9dc0
* | | | Merge "Add failing obfuscation test with class repackaging" into ub-jackBenoit Lamarche2015-02-196-0/+57
|\ \ \ \ | |/ / / |/| | |
| * | | Add failing obfuscation test with class repackagingBenoit Lamarche2015-02-196-0/+57
| | | | | | | | | | | | | | | | | | | | Bug: 19422723 Change-Id: I6f0fa01194f266a3a80ee6d13cafd2222e31e4b2
* | | | Merge "Remove list and isJackFileNameOf usages into loadClassOrInterface" ↵mikaelpeltier2015-02-191-26/+18
|\ \ \ \ | | | | | | | | | | | | | | | into ub-jack
| * | | | Remove list and isJackFileNameOf usages into loadClassOrInterfacemikaelpeltier2015-02-191-26/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Rather than using list method to search an inputVFile, create the expected VPath and uses getInputVFile method from a InputVDir. Change-Id: I8d3cc9b3ffb9b0fd159175dfefc87167116c02d2
* | | | | Merge "Avoid set copy into jack merger" into ub-jackmikaelpeltier2015-02-191-20/+30
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Avoid set copy into jack mergermikaelpeltier2015-02-191-20/+30
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Automatically add items of dex to merge into global item sets, and remove then only when there is an overflow. By the way, we try to move penality only when there is an overflow rather in others cases. Change-Id: I4b16ab5541df3c7a7a14be95666b818d74fc7686
* | | | Merge "Remove a usage of list method into JaycePackageLoader" into ub-jackmikaelpeltier2015-02-191-7/+12
|\ \ \ \
| * | | | Remove a usage of list method into JaycePackageLoadermikaelpeltier2015-02-111-7/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | - getLoaderForSubPackage does not need to use list method, we can build the VPath of the expected folder to see if it exists or not. Change-Id: I36bf9a122b6d4bdc46b6b12425d3ff657bf43a01
* | | | Merge "Avoid to create useless Joiner" into ub-jackmikaelpeltier2015-02-192-3/+12
|\ \ \ \
| * | | | Avoid to create useless Joinermikaelpeltier2015-02-112-3/+12
| |/ / / | | | | | | | | | | | | Change-Id: Iecba786b73286a511b856ff7c092c229512a24b9
* | | | Merge "Remove Tracer from JSession to be homogeneous with others usages" ↵mikaelpeltier2015-02-192-16/+11
|\ \ \ \ | | | | | | | | | | | | | | | into ub-jack
| * | | | Remove Tracer from JSession to be homogeneous with others usagesmikaelpeltier2015-02-112-16/+11
| |/ / / | | | | | | | | | | | | Change-Id: I22ca56c2f2d3f4fedba416eb67f8a4245a8caa52
* | | | Merge "Optimize VPath append and prepend" into ub-jackBenoit Lamarche2015-02-181-5/+13
|\ \ \ \ | |_|_|/ |/| | |
| * | | Optimize VPath append and prependBenoit Lamarche2015-02-101-5/+13
| |/ / | | | | | | | | | Change-Id: I14b3499b6a31f4598766c7e7ce7fa03905901bcb
* | | Merge "Fix LegacyJillToolchain in jack-tests" into ub-jackJean-Marie Henaff2015-02-1817-92/+380
|\ \ \
| * | | Fix LegacyJillToolchain in jack-testsJean-Marie Henaff2015-02-1817-92/+380
| | | | | | | | | | | | | | | | Change-Id: Ib9d9f88e1edc231be58125bca9ac71b7af88990f
* | | | Merge "Use new VFS everywhere" into ub-jackBenoit Lamarche2015-02-184-19/+25
|\ \ \ \ | |/ / / |/| | |
| * | | Use new VFS everywhereBenoit Lamarche2015-02-104-19/+25
| |/ / | | | | | | | | | Change-Id: Iedd0b9743c20ccc0a8e5d270c4743b109c793f31
* | | Fix LegacyToolChain with ecj and source list filesJean-Marie Henaff2015-02-181-4/+1
| | | | | | | | | | | | Change-Id: I28242ab9507055c6688e2a1b8fc1d5d99dfff252
* | | Rename test results directoriesJean-Marie Henaff2015-02-181-27/+27
| |/ |/| | | | | | | | | Rename according to ant target names. Change-Id: I111f14819a3296ff80a97dbd0373834a34c880b1
* | Ensure all junit failures are caught by Ant scriptJean-Marie Henaff2015-02-171-4/+4
| | | | | | | | | | | | | | | | | | Only errors were caught, failureproperty attribute catches both errors and failures. Bug: 19405868 Change-Id: I1e96f809f38146192a99a05e9c193753ec9cdab3
* | Merge "Bump version to 1.1-a4" into ub-jackJean-Philippe Lesot2015-02-161-1/+1
|\ \
| * | Bump version to 1.1-a4Benoit Lamarche2015-02-131-1/+1
| | | | | | | | | | | | Change-Id: I20c2981951e2acde5a23974c691baa8ec59c822e
* | | Remove default bootclasspath in legacy compilers for testsJean-Marie Henaff2015-02-1611-6/+132
| | | | | | | | | | | | | | | | | | Classpath is explicitely passed by each test. Change-Id: Id492cd9b515ed489291fb3a6e0a3693704774208
* | | Merge "Fix anonymous class handling in DexAnnotationsComparator" into ub-jackBenoit Lamarche2015-02-161-10/+31
|\ \ \
| * | | Fix anonymous class handling in DexAnnotationsComparatorBenoit Lamarche2015-02-101-10/+31
| | | | | | | | | | | | | | | | Change-Id: I531f0130ce4b405f43aafe11dd374035e1cb9f1c
* | | | Merge "Make DexTagTests compatible with CLI testing" into ub-jackBenoit Lamarche2015-02-162-4/+21
|\ \ \ \
| * | | | Make DexTagTests compatible with CLI testingBenoit Lamarche2015-02-162-4/+21
| | |/ / | |/| | | | | | | | | | Change-Id: Ib5cc13c4f58c3815be691a886b79c308d12ea873
* | | | Ignore some FileConflictTests with cli based toolchainsJean-Marie Henaff2015-02-161-24/+39
|/ / / | | | | | | | | | Change-Id: Ibbaadba3409c8d94a7c8564f783f195220196615
* | | Merge "Dex files are retrieved from their input library or from output ↵mikaelpeltier2015-02-123-50/+33
|\ \ \ | | | | | | | | | | | | library" into ub-jack
| * | | Dex files are retrieved from their input library or from output librarymikaelpeltier2015-02-103-50/+33
| | |/ | |/| | | | | | | | | | Bug: 19291536 Change-Id: I94ae5e3d8cf1241aab374a678ca9c2895f55831d
* | | Merge "Remove useless code" into ub-jackmikaelpeltier2015-02-121-2/+0
|\ \ \
| * | | Remove useless codemikaelpeltier2015-02-111-2/+0
| |/ / | | | | | | | | | Change-Id: I9567cfefb6690e73f517123f76be593bcfb924ec
* | | Enable incremental log by defaultmikaelpeltier2015-02-121-1/+1
|/ / | | | | | | Change-Id: I1973d466a8c665df7df0c56b2c07395f86d8bb86
* | Merge "Add support for source list files with jackApiToolchain" into ub-jackJean-Marie Henaff2015-02-091-3/+22
|\ \
| * | Add support for source list files with jackApiToolchainJean-Marie Henaff2015-02-091-3/+22
| | | | | | | | | | | | Change-Id: I782b7092be31db745bce4f5ea5e88b59a6d2e15f
* | | CheckStyle passJean-Marie Henaff2015-02-092-2/+2
| | | | | | | | | | | | Change-Id: Iad1d4b81fcaca5375dc769b45f22a2b4cb2cc816
* | | Merge "No need to check that a file exists before delete it" into ub-jackmikaelpeltier2015-02-091-2/+0
|\ \ \
| * | | No need to check that a file exists before delete itmikaelpeltier2015-02-091-2/+0
| | | | | | | | | | | | | | | | Change-Id: If6f2408dfa5ed1128404b39bac6889c00fa7fced
* | | | Add a test that fails with --incremental-folder, --import and --multi-dexmikaelpeltier2015-02-062-2/+63
|/ / / | | | | | | | | | | | | Bug: 19291536 Change-Id: I38b3c3c0715d6513c0cf796df3eba7bdd4b2e468
* | | Retry adding CachedDirectFSBenoit Lamarche2015-02-069-17/+483
|/ / | | | | | | Change-Id: I389b367f5a425ea58733b8f8dc8533464d3974d7
* | Merge "Add new VFile delete API" into ub-jackBenoit Lamarche2015-02-0524-107/+123
|\ \
| * | Add new VFile delete APIBenoit Lamarche2015-02-0424-107/+123
| | | | | | | | | | | | | | | | | | And remove VDir delete API Change-Id: I628b96ba1d51a3736bf996a611832c1a2c844af3
* | | Merge "Switch enum support must generate determinist code" into ub-jackmikaelpeltier2015-02-041-3/+3
|\ \ \
| * | | Switch enum support must generate determinist codemikaelpeltier2015-02-041-3/+3
| |/ / | | | | | | | | | | | | | | | | | | - Now generated code to initialize constant array indexed by ordinal value of enum field is determinist. Change-Id: I7709093ed16291bcb3757541a9019e4135498690
* | | Merge "Resolve forward branch in the order of addition" into ub-jackmikaelpeltier2015-02-041-3/+3
|\ \ \ | |/ / |/| |