summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
| * | DO NOT MERGE - Add a -knowntags option to droiddocJoe Onorato2010-09-162-2/+65
| | | | | | | | | | | | | | | | | | | | | This lets us remove the special cases in Comment.java and specify additional tags to not warn about for the big docs build. Change-Id: I25ad651616f162919c56daa2d4bdf6333c9dd87d
* | | am ea5d7a9d: move File and Difference classes into common scriptDoug Zongker2010-09-132-142/+144
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'ea5d7a9de7660bef5b9c68f6372a92d4b2f2f1f6' into gingerbread-plus-aosp * commit 'ea5d7a9de7660bef5b9c68f6372a92d4b2f2f1f6': move File and Difference classes into common script
| * | move File and Difference classes into common scriptDoug Zongker2010-09-122-142/+144
| | | | | | | | | | | | | | | | | | | | | This makes them accessible from device-specific extensions (so they can be used to send radio images as binary patches, for instance). Change-Id: I2f2174b93b4265abf9400f9e5a0982caca0771e9
* | | am 93d574f8: Merge "return to using subprocess for running commands" into ↵Doug Zongker2010-09-031-10/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9' into gingerbread-plus-aosp * commit '93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9': return to using subprocess for running commands
| * | Merge "return to using subprocess for running commands" into gingerbreadDoug Zongker2010-09-031-10/+4
| |\ \
| | * | return to using subprocess for running commandsDoug Zongker2010-09-031-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverts Ic4f1c747 and fixes the problem by splitting the extra_flags argument (it wasn't working before because it was getting one argument "-c 4096 -s 128" instead of four arguments "-c", "4096", "-s", "128" and mkyaffs2image apparently just ignores that bogus argument?) Change-Id: Ib1e08d634aa68bfab0f7e09680d407f2cee0797d
* | | | am c637db16: remove remaining amend supportDoug Zongker2010-09-033-321/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'c637db16d83b2c248b1cf0122e2ba558ed95762c' into gingerbread-plus-aosp * commit 'c637db16d83b2c248b1cf0122e2ba558ed95762c': remove remaining amend support
| * | | remove remaining amend supportDoug Zongker2010-09-033-321/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | Remove the remaining (unused and untested) support for generating amend scripts. This means that you won't be able to OTA directly from cupcake to gingerbread. Change-Id: Iaf5295db92a42b336960d05295f48b67cb729337
* | | am cd7c775e: fix the build stillJoe Onorato2010-08-311-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'cd7c775ece6854765ae3208818e76d9d11724713' into gingerbread-plus-aosp * commit 'cd7c775ece6854765ae3208818e76d9d11724713': fix the build still
| * | fix the build stillJoe Onorato2010-08-311-0/+3
| | | | | | | | | | | | Change-Id: I2bfbcdd4b463549f3f331ac7a1c7fa89aadef1a8
* | | am 0ee89a72: DO NOT MERGE - Back port change from master that enforces ↵Joe Onorato2010-08-312-5/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | correctness in the javadoc comments. Merge commit '0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb' into gingerbread-plus-aosp * commit '0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb': DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
| * | DO NOT MERGE - Back port change from master that enforces correctness in the ↵Joe Onorato2010-08-312-5/+27
| | | | | | | | | | | | | | | | | | javadoc comments. Change-Id: I886448a3126b81c19342d920669e050eb5ef20eb
* | | am ae553143: Refactor a bit.Ying Wang2010-08-261-5/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'ae5531434877478985186dd0fb7ffefa12a74e52' into gingerbread-plus-aosp * commit 'ae5531434877478985186dd0fb7ffefa12a74e52': Refactor a bit.
| * | Refactor a bit.Ying Wang2010-08-261-5/+1
| | | | | | | | | | | | Change-Id: I4573e7a5239536f49571d9222865e2526da573c8
* | | am aa6dbe21: Try to fix system.img in update zip file.Ying Wang2010-08-261-3/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'aa6dbe2144196bb6f9c1b6b539126250f9ef8af6' into gingerbread-plus-aosp * commit 'aa6dbe2144196bb6f9c1b6b539126250f9ef8af6': Try to fix system.img in update zip file.
| * | Try to fix system.img in update zip file.Ying Wang2010-08-261-3/+13
| | | | | | | | | | | | Change-Id: Ic4f1c7478a22b1f8134ac768904e437fcfea700a
* | | am d421f57d: Fix mkyaffs2image extra flags in the release tools.Ying Wang2010-08-252-4/+24
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d' into gingerbread-plus-aosp * commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d': Fix mkyaffs2image extra flags in the release tools.
| * | Fix mkyaffs2image extra flags in the release tools.Ying Wang2010-08-252-4/+24
| | | | | | | | | | | | Change-Id: I806e3e85ef89941edf04352331e25730c491c470
* | | am 4de6b5bf: Fix mkbootimg parameters for releasetools.Ying Wang2010-08-251-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '4de6b5bfc89de95b18514e75329a2ec7491bebbd' into gingerbread-plus-aosp * commit '4de6b5bfc89de95b18514e75329a2ec7491bebbd': Fix mkbootimg parameters for releasetools.
| * | Fix mkbootimg parameters for releasetools.Ying Wang2010-08-251-0/+5
| | | | | | | | | | | | Change-Id: I6192743e9db415f5fe7f3b82081f8a82061254b3
* | | am 0962b719: Merge "DO NOT MERGE: Fix the build by ignoring directories that ↵Bill Napier2010-08-251-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | don\'t exist." into gingerbread Merge commit '0962b71980b7e850a1ef87766ae12de16ab2efb4' into gingerbread-plus-aosp * commit '0962b71980b7e850a1ef87766ae12de16ab2efb4': DO NOT MERGE: Fix the build by ignoring directories that don't exist.
| * | DO NOT MERGE: Fix the build by ignoring directories that don't exist.Bill Napier2010-08-251-0/+1
| | | | | | | | | | | | Change-Id: I97ba9eca73f020eae0fa36ae94db35e70c9985d3
* | | am cb92616f: Merge "Add support for multiple html directories to droiddoc." ↵Rohit Mungee2010-08-242-12/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd' into gingerbread-plus-aosp * commit 'cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd': Add support for multiple html directories to droiddoc.
| * | Merge "Add support for multiple html directories to droiddoc." into gingerbreadRohit Mungee2010-08-242-12/+17
| |\ \
| | * | Add support for multiple html directories to droiddoc.Bill Napier2010-08-242-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The goal for adding this support is to allow droiddoc to pull html files both from the static content and from content generated at build time. Change-Id: I5d4b2432aa78b0b3559daacedfb7a29675701f33
* | | | am ee4bad51: Disable CheckSize on ext partitions to fix build [DO NOT MERGE]Ying Wang2010-08-241-2/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51' into gingerbread-plus-aosp * commit 'ee4bad51bc7ff49c37c9a105ad68dddf0a3b0d51': Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
| * | | Disable CheckSize on ext partitions to fix build [DO NOT MERGE]Ying Wang2010-08-241-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Original CL: 59920 Change-Id: I81437996670a61e10284293d25a08da8907ad296
* | | | am 065521be: Backport ext4 support from master [DO NOT MERGE]Ying Wang2010-08-231-7/+37
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '065521be4fd6965058fbd599bb43fe13101fee7c' into gingerbread-plus-aosp * commit '065521be4fd6965058fbd599bb43fe13101fee7c': Backport ext4 support from master [DO NOT MERGE]
| * | | Backport ext4 support from master [DO NOT MERGE]Ying Wang2010-08-231-7/+37
| |/ / | | | | | | | | | | | | | | | ext4 support is needed by crespo. Change-Id: I604cb9ada526ce8ba6b3648171ac1d614a5519a9
* | | am 6eea9363: am 4f2436dc: update carousel icon for nexus one dev phoneScott Main2010-08-051-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '6eea9363f4aeaa861f2e021ea3c9494cb49a83b6' into gingerbread-plus-aosp * commit '6eea9363f4aeaa861f2e021ea3c9494cb49a83b6': update carousel icon for nexus one dev phone
| * | am 4f2436dc: update carousel icon for nexus one dev phoneScott Main2010-08-051-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '4f2436dc3513f671935811bfa0c7e6c2c15505be' into gingerbread * commit '4f2436dc3513f671935811bfa0c7e6c2c15505be': update carousel icon for nexus one dev phone
| | * update carousel icon for nexus one dev phoneScott Main2010-08-051-0/+0
| | | | | | | | | | | | Change-Id: I7f92063a7dc6b49dd6bb044b79931dbc9268ebd6
* | | am be4696e0: am 7589398c: Merge "Doc change: Add nexus one to dev phones ↵Scott Main2010-08-051-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | image." into froyo Merge commit 'be4696e073b93e0e65f767e77166a08efd67c6cb' into gingerbread-plus-aosp * commit 'be4696e073b93e0e65f767e77166a08efd67c6cb': Doc change: Add nexus one to dev phones image.
| * | am 7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyoScott Main2010-08-051-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '7589398cf9127987a768ccfb3dbb9cde54d00f02' into gingerbread * commit '7589398cf9127987a768ccfb3dbb9cde54d00f02': Doc change: Add nexus one to dev phones image.
| | * Doc change: Add nexus one to dev phones image.Dirk Dougherty2010-07-231-0/+0
| | | | | | | | | | | | Change-Id: I39541b208ed4a2f7b7f48c42f37f3ccdfc05de02
* | | am 7dc35a3b: Tracking merge of dalvik-dev to gingerbreadBrian Carlstrom2010-08-051-0/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0' into gingerbread-plus-aosp * commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0': Tracking merge of dalvik-dev to gingerbread
| * | Tracking merge of dalvik-dev to gingerbreadBrian Carlstrom2010-08-041-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | git cherry-pick --no-commit f2f3e4b2 git cherry-pick --no-commit b6a08f0cd36b12054ac73992a2737ea294387116 git cherry-pick --no-commit d05d74b2d6f717ee25ca14c913ea7610c030ecd1 git cherry-pick --no-commit 5479d77e320420ef0cd7250d1a6729839ef907ce Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
* | | am 81f42236: am 9269a711: docs: ensure code-ified links in qv are the proper ↵Scott Main2010-07-151-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | color Merge commit '81f42236e2971caac9354686d7acbe40f3fe0f4e' into gingerbread-plus-aosp * commit '81f42236e2971caac9354686d7acbe40f3fe0f4e': docs: ensure code-ified links in qv are the proper color
| * | am 9269a711: docs: ensure code-ified links in qv are the proper colorScott Main2010-07-151-1/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '9269a711753f2523acd3fe5ae661559f754a1bd0' into gingerbread * commit '9269a711753f2523acd3fe5ae661559f754a1bd0': docs: ensure code-ified links in qv are the proper color
| | * docs: ensure code-ified links in qv are the proper colorScott Main2010-07-151-1/+2
| | | | | | | | | | | | Change-Id: I61dd859e0749573746c9bfcbf224758463370ba7
* | | am d7324cc3: Merge "Fix event-log-tags so we don\'t rebuild framework.jar ↵Joe Onorato2010-07-151-8/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | because of an installclean." into gingerbread Merge commit 'd7324cc356e9c67d878d156ca81928ab2ef220f5' into gingerbread-plus-aosp * commit 'd7324cc356e9c67d878d156ca81928ab2ef220f5': Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
| * | Fix event-log-tags so we don't rebuild framework.jar because of an installclean.Joe Onorato2010-07-141-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | Produce an event logs tag file for everything we know about, in order to properly allocate numbers. Then produce a file that's filtered for what's going to be installed. Change-Id: Id0778aec0b4d045e8ff91ba2c9c8265e860eaba5
* | | merge from open-source masterThe Android Open Source Project2010-07-091-1/+8
|\ \ \ | |/ / |/| | | | | Change-Id: Ic005b0772e144fc986fd3bacc67d5840b16efb81
| * | Create systemtarball either with bz2 or gzBruce Beare2010-07-081-1/+8
| | | | | | | | | | | | | | | Change-Id: I64e93872942e8dcad4a894a906be7912bb6da308 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
| * | am 81b68ad9: Merge "docs: show the download message on the SDK homepage ↵Scott Main2010-06-242-5/+22
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because we no longer need to walk through the TOS" into froyo Merge commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488' into froyo-plus-aosp * commit '81b68ad95d6a8ecb8a44ad453d336dff3a059488': docs: show the download message on the SDK homepage because we no longer
| * \ \ am 3b85269c: include build timestamp in OTA metadataDoug Zongker2010-06-211-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3b85269cfe10ec15e9b544dd6964b8c9f5f761f9' into froyo-plus-aosp * commit '3b85269cfe10ec15e9b544dd6964b8c9f5f761f9': include build timestamp in OTA metadata
| * \ \ \ am 2b8d2383: Merge changes I02214abd,I79e6f60e into froyoJoe Onorato2010-06-152-3/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1' into froyo-plus-aosp * commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1': Add a tapas command. Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
| * \ \ \ \ am 7a794289: Merge "Unbundle the build system." into froyoYing Wang2010-06-091-0/+23
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7a7942899eedde3b946768a155fac3d70af5c9c3' into froyo-plus-aosp * commit '7a7942899eedde3b946768a155fac3d70af5c9c3': Unbundle the build system.
* | \ \ \ \ \ am b66a5c05: docs: modify redirect link textScott Main2010-07-081-4/+4
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f' into gingerbread * commit 'b66a5c0574e14b838d9dc2497540ffc6cb73dc4f': docs: modify redirect link text
| * | | | | | docs: modify redirect link textScott Main2010-07-081-4/+4
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Change-Id: Ieb26c4278958624b9c7aa8795cd7a8cab87fafec