summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump version to 1.1-rc5Jean-Marie Henaff2015-06-196-10/+10
| | | | Change-Id: I386528d23f1e25cb039d496f4d1121bce091d6a4
* Check for source sub-file existence in CommonFilterBenoit Lamarche2015-06-191-2/+9
| | | | | | | Files contained in source directories may contain symbolic links that have targets that don't exist. Change-Id: I7428f15415efb32f085d213b7c24f06ad515b386
* Update path of jpp file used by MultiDex testsmikaelpeltier2015-06-191-2/+2
| | | | | Change-Id: Icadfa334cc3152fe5a830199d10ae3c3ea3d41b8 (cherry picked from commit 833cd465bf28f3c89018b2f197c4890083cb3793)
* Merge "Exclude a Phantom test from Jill toolchain" into ub-jack-brestJean-Philippe Lesot2015-06-181-1/+3
|\
| * Exclude a Phantom test from Jill toolchainBenoit Lamarche2015-06-181-1/+3
| | | | | | | | | | | | | | I have recently reenabled this test since it now works, but I should have excluded it from the Jill toolchain like the others. Change-Id: I17da8c68e08ea5e54d0548cdf77fc5e6238f4ef0
* | Merge "Declare CLI api and let Jack implement it" into ub-jack-brestJean-Philippe Lesot2015-06-186-1/+257
|\ \
| * | Declare CLI api and let Jack implement itYohann Roussel2015-06-186-1/+257
| | | | | | | | | | | | | | | | | | This should allow compatibility with the next server. Change-Id: Ic57b3b68fa31caad24298be24bed3db6f533ab2d
* | | Fix FileConflictTests, againBenoit Lamarche2015-06-181-8/+3
| |/ |/| | | | | | | | | | | | | | | The ResourceImportConflictException message has changed, so some tests are broken. (cherry picked from commit f162d3fef845afdcf63b48316eec5135c2b2368b) Change-Id: Ib7f1fa0c54dffef94bf7ad3e955bd16b16b212da
* | Merge "Add jack*-version.properties resource files" into ub-jack-brestJean-Marie Henaff2015-06-182-1/+37
|\ \
| * | Add jack*-version.properties resource filesJean-Marie Henaff2015-06-182-1/+37
| | | | | | | | | | | | | | | | | | In other projects than Jack Change-Id: I939b6739afd9ea1edb16c516d95e8a3bdefcc40c
* | | Merge "Add a jack-version.properties resource" into ub-jack-brestYohann Roussel2015-06-181-0/+26
|\ \ \
| * | | Add a jack-version.properties resourceYohann Roussel2015-06-181-0/+26
| | |/ | |/| | | | | | | | | | | | | This is a step in direction to compatibility with the next server. Change-Id: Ic5cd94dc89fec244e2883c45c3dfc8095be19bd5
* | | Fix long MultiDexTestsBenoit Lamarche2015-06-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | JPP file has moved. (cherry picked from commit 886e13d068b0d7dd1408743dd6b673c4816b60fe) Change-Id: I8760d31c6c981ebda35ecdcf0011b11600aa250a
* | | Adapt MultiDexTests to support CaseInsensitiveFSBenoit Lamarche2015-06-182-49/+23
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 21486756 (cherry picked from commit 7be6522ac6df670a3c1feafa5cd08652f4854aa8) Change-Id: Ied2da33995a96c6d776616f47c8cf1793a78bc9a
* | | Add addMetaDir(File) in JackBasedToolchainJean-Marie Henaff2015-06-184-1/+33
| | | | | | | | | | | | | | | | | | | | | Bug: 21722784 (cherry picked from commit 459a4a32942aec2634967cd54cace98452d478f2) Change-Id: Ia19cd3687da55af6f62299f17100ddabebae86c7
* | | Adapt WithPhantomTests to support CaseInsensitiveFSBenoit Lamarche2015-06-181-40/+53
| | | | | | | | | | | | | | | | | | | | | Bug: 21486756 (cherry picked from commit de648be7da54458746b89dd736cd159ee43309a1) Change-Id: Iaa536a6a2fcdc3e35692f355b5b2317f413a54d6
* | | Rewrite FileConflictTestsBenoit Lamarche2015-06-1810-248/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18198113 Bug: 21486756 (cherry picked from commit 9029bd42070b288cf939d8a21d6c8d6a8adbc95a) Change-Id: Ie071003c728b63acf676043632b9375158b92d2f
* | | Rework ResourceImportConflictExceptionBenoit Lamarche2015-06-183-10/+9
| |/ |/| | | | | | | | | | | | | | | With CaseInsensitiveFS it seems obvious that the relative path of the resource should be mentioned in the error message. (cherry picked from commit f952e84878bc26f24bb19b7faaf0a4686cb60cee) Change-Id: Ie24a59f7d74748a8db4ebd7a37454693bb144838
* | Rename addResource() to document it expects a directoryJean-Marie Henaff2015-06-186-15/+15
| | | | | | | | | | | | (cherry picked from commit b9afd7d44558114893933c2d9168607030ff7ae4) Change-Id: If366d939c72dd167b4aff315033fe74fc9741804
* | Merge "Fix missing tmp dir deletion" into ub-jack-brestJean-Marie Henaff2015-06-181-3/+6
|\ \
| * | Fix missing tmp dir deletionJean-Marie Henaff2015-06-181-3/+6
| |/ | | | | | | | | | | | | | | | | | | | | | | Share the same runnable hooks between Jack checks and Jack run in Jack api implementation. Otherwise tmpdir created during checks are not deleted. Bug: 20523457 (cherry picked from commit 0a258f00c03b5bae823b38ef3a541da6bb1b5381) Change-Id: I8dd72d52801779ae59f70cd1725057152b59bdea
* | Merge "Add support for case-sensitive FS in ReadWriteZipFS" into ub-jack-brestBenoit Lamarche2015-06-187-95/+57
|\ \ | |/ |/|
| * Add support for case-sensitive FS in ReadWriteZipFSBenoit Lamarche2015-06-177-95/+57
| | | | | | | | | | | | | | | | | | | | | | | | Also: - deleted ZipInputOutputVFSCodec which is unused and similar to ZipFSCodec. - introduce constants in JackLibrary for numGroups and groupSize. Bug: 21796981 (cherry picked from commit 37f4d45c334a2e15f0d8aee2fadb2cd823b4ee54) Change-Id: Id744da9c97a04adf728b8688c91a0816715d5cce
* | Modify resource managment when Jack does an incremental buildmikaelpeltier2015-06-184-8/+49
|/ | | | | | | | | | - Delete all resources from the incremental folder, and load resources into JSession from imported libraries before modifying the list of imported libraries. Bug: 21515528 Change-Id: I9b63ec46eaf4ed0473fdce56d7b4917ba16b264a (cherry picked from commit 3dd4f30717a18c3d5143d67f197e34d834f3d152)
* Adapt FileAccessErrorTest to support CaseInsensitiveFSBenoit Lamarche2015-06-172-8/+19
| | | | | | | | | | | This is a bit hackish since it uses the Location, but I guess that for a test it'll do. Bug: 21486756 (cherry picked from commit 64e246e3b74e6989a4f930192cc7ed81fd2ed667) Change-Id: Ie301194abc50fcc1db9801e93736579c8d03667c
* Adapt and fix DependenciesTestsBenoit Lamarche2015-06-172-48/+51
| | | | | | | Bug: 21486756 (cherry picked from commit 2b27649753700cc3ab6194afc51f8192c472d241) Change-Id: I69da6542c52940f13b6304675e8324386bb4228f
* Adapt ResourceTests to support CaseInsesitiveFSBenoit Lamarche2015-06-177-104/+152
| | | | | | Bug: 21486756 Change-Id: I3f0e0b7d6a2511b08129bff4bc34a0ba54aead4e (cherry picked from commit 973a373d8fc030c0ea3e8f6113caa29be3776454)
* Wrap FrontendCompilationException in Api01Benoit Lamarche2015-06-102-1/+4
| | | | | | Bug: 21751566 Change-Id: I029be65253f9dbd172a5be21f3beb8bf1be3b12a (cherry picked from commit f2bc7ad704d4187e1618bc9ef1fe30c4a03ba304)
* Bump version to 1.1-rc4Jean-Marie Henaff2015-06-094-5/+5
| | | | Change-Id: Ice10c5a08797a5b6ed86a4353776b697c9ef0025
* Fix a permgen memory leak in ThreadConfigJean-Philippe Lesot2015-06-081-1/+1
| | | | | Change-Id: I68fb1be3a4f9899180acc79928ee7a00bb75d20d (cherry picked from commit 09e6e4002bcd372300e1313d7c2b6925f5e8d964)
* Merge "Fix bugs when using incremental with --output-jack" into ub-jack-brestJean-Philippe Lesot2015-06-086-73/+37
|\
| * Fix bugs when using incremental with --output-jackmikaelpeltier2015-06-056-73/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When --output-jack is used, incremental folder contains all dex files and jayces files of imported libraries, thus Jack must remove imported libraries and import only incremental folder when --output-jack is used to avoid type conflict. It seems more performant than using collision policy. - Since ReadWriteZipFS and VFStoVSTWrapper is used incremental support with --output-jack was broken because input jack library has the location of incremental folder and output jack library has the location of the target jack file. Thus comparing location to avoid to copy dex file from a library to the same library does not work. I clean library usages to always used ReadWriteZipFS when it is required and to be able to properly skip dex copy when source and target library are the same library. Bug: 21600202 Change-Id: I0c5e899e12033f608d43cae9baecc1227ea158c9 (cherry picked from commit f524ed6445145988a8a7c4fc6ff5573c3cc882cd)
* | JPackage should never try to load a renamed or deleted itemsmikaelpeltier2015-06-053-10/+53
|/ | | | | | | Bug: 21105000 Change-Id: I4f4b2d355e57deb9e00b64c0f263a75daf8505d0 (cherry picked from commit 69d2257dd865f3ba9012ad33dbceba97e15730b9)
* Bump version to 1.1-rc3Jean-Marie Henaff2015-06-014-5/+5
| | | | Change-Id: Id9e880c800d49258aabf6c47fd58dfd7f377fdb8
* Bump launcher version to 1.1-rc2Yohann Roussel2015-06-011-1/+1
| | | | Change-Id: I73226fa772e2147a19f9bab60c4f184503fbbbd3
* Fix debug mode of CaseInsensitiveFSBenoit Lamarche2015-06-011-1/+1
| | | | | | (cherry picked from commit e090a907b6efed3bd963f2d989cdd0a8828e4c64) Change-Id: I7110fe6dc9a9a86af91fccfbd6e98b270ede17c9
* Use 1 group instead of 2 for CaseInsensitiveFS digestBenoit Lamarche2015-06-013-3/+3
| | | | Change-Id: I0a19919d0e99ac550ccf6eea7576c920aa17df21
* Merge "Use CaseInsesitiveFS for all library output dirs" into ub-jack-brestBenoit Lamarche2015-05-294-8/+143
|\
| * Use CaseInsesitiveFS for all library output dirsBenoit Lamarche2015-05-294-8/+143
| | | | | | | | | | | | | | | | Bug: 18750643 (cherry picked from commit 1751a7aba3ae72251ea8b83592967034a6f8996c) Change-Id: Ifb600f8c0f3213631be91c0a080afe6d5d93e1b6
* | Merge "Temporarly deactivate tests that are broken because of ↵Benoit Lamarche2015-05-296-0/+28
|\| | | | | | | CaseInsensitiveFS" into ub-jack-brest
| * Temporarly deactivate tests that are broken because of CaseInsensitiveFSBenoit Lamarche2015-05-296-0/+28
| | | | | | | | | | | | | | | | | | They will need to be modified Bug: 21486756 (cherry picked from commit 02859f0c0a29d30e6b8561c7854fd992271c4760) Change-Id: If5c39e4f4e1d3be9772a33493b3cb178412ebe19
* | Merge "Always close the Jack output library" into ub-jack-brestBenoit Lamarche2015-05-295-153/+179
|\|
| * Always close the Jack output libraryBenoit Lamarche2015-05-295-153/+179
| | | | | | | | | | | | | | | | | | | | This change is required to make sure the Jack output library is closed, even when buildSession fails. It also makes sure that there is only one Jack output library instance. (cherry picked from commit 209c4fd6b447acceb73987f7df16c5bfbdf1ba0f) Change-Id: I16ed98ed34f6864ac518cac26d4157a35ae30e56
* | Merge "Adapt ClasspathTests to use InputJackLibrary" into ub-jack-brestBenoit Lamarche2015-05-292-4/+17
|\|
| * Adapt ClasspathTests to use InputJackLibraryBenoit Lamarche2015-05-292-4/+17
| | | | | | | | | | | | (cherry picked from commit 860b271f80ccbd6d283fe671444a9c89c0ff892d) Change-Id: Icdbad809fdfdfdacaa5c63c9b7812846fd7390c7
* | Merge "Adapt incremental tests to use InputJackLibary" into ub-jack-brestBenoit Lamarche2015-05-297-67/+61
|\|
| * Adapt incremental tests to use InputJackLibaryBenoit Lamarche2015-05-297-67/+61
| | | | | | | | | | | | (cherry picked from commit 097b5d6e807b250847ec9ff27f4a7ac7a336620f) Change-Id: I954bb80fe35fcc59043665400dd8331e2153427b
* | Merge "Add support to append in VFS" into ub-jack-brestBenoit Lamarche2015-05-2921-29/+173
|\|
| * Add support to append in VFSBenoit Lamarche2015-05-2921-29/+173
| | | | | | | | | | | | (cherry picked from commit 9495b1087a937a6175dda075bdd082864c09dc21) Change-Id: Iccece3057dcac434c24c29c152ed65e32d6ba18f
* | Merge "Add getLastModified() to VFile" into ub-jack-brestBenoit Lamarche2015-05-2920-8/+96
|\|