summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* ADBS now uses stack_core code to parse traces.Brigid Smith2014-07-071-184/+8
| | | | Change-Id: Ic1d822e2599fb0ad54dbe20d54e1dd6e3eaf18d6
* Document the worker_threads option.Martin Blumenstingl2014-06-111-3/+11
| | | | Change-Id: I44775493bedc0c7224c2c4ef06330bdb1430a1b6
* am c0f10644: Merge "make SignApk do zip alignment"Doug Zongker2014-05-161-10/+66
|\ | | | | | | | | * commit 'c0f10644bf877fae44e8aa5ebfff41f0e27af197': make SignApk do zip alignment
| * make SignApk do zip alignmentDoug Zongker2014-05-151-10/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When signing an APK, make the SignApk tool align the stored entries to (by default) 4-byte boundaries. This obviates the need to run the separate zipalign tool, which currently does this job. The alignment byte count can be specified with the -a option. OTA package signing (with -w) never does alignment. The order of files in the output APK is changed so that all stored files come first in the output, followed by all non-stored files. This is not expected to have any impact in practice. Change-Id: Iaeef89b2a7283e25fadb99c0a0f0641f682d76b8
* | am a74ade94: Merge "Support host multilib build"Ying Wang2014-05-151-2/+1
|\ \ | |/ | | | | | | * commit 'a74ade945776e80f99f3b05d06a131cfd353c3f6': Support host multilib build
| * Support host multilib buildYing Wang2014-05-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change basically ported our target multilib to the host side. It supports 2 host build modes: x86 and x86_64 multilib build. For now you need to set "BUILD_HOST_64bit=true" to switch to x86_64 multilib build. Later we'll default to x86_64 build and have a flag to force 32-bit only build, which may be needed by SDK build. In host module definition, like in target ones, you can use the following LOCAL variables to set up multilib configuration: LOCAL_MULTILIB: can be "both", "first", "32" or "64". It also supports the same set of arch or 32-vs-64 specific LOCAL variables. By default, it builds only for the first arch. To keep path compatibility, in x86_64 build files are still output to out/host/linux-x86; Both 32-bit and 64-bit executables are in out/host/linux-86/bin; In x86_64 build 32-bit shared libraries are installed to out/host/linux-x86/lib32 and 64-bit shared libraries are installed to out/host/linux-x86/lib; 32-bit object files are output to out/host/linux-x86/obj32 and 64-bit object files are output to out/host/linux-x86/obj. Bug: 13751317 Change-Id: I6044f83b7db369a33e05209e8c588eb6dc83409f
* | Merge commit '8113e43601aac7702b9ec007e81a179826143d1e' into HEADBill Yi2014-04-29206-147/+18114
|\ \ | |/ |/|
| * am 49b4ef0b: am fd0be925: docs: Added SDK version to the ADT bundles ↵Ricardo Cervera2014-03-251-31/+31
| |\ | | | | | | | | | | | | | | | | | | download path in the CS template. * commit '49b4ef0badd51ce3af0511206e20114414a6c427': docs: Added SDK version to the ADT bundles download path in the CS template.
| | * am fd0be925: docs: Added SDK version to the ADT bundles download path in the ↵Ricardo Cervera2014-03-251-31/+31
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | CS template. * commit 'fd0be925bb6e34768f9f11cf5325d1fcfbf39410': docs: Added SDK version to the ADT bundles download path in the CS template.
| | | * docs: Added SDK version to the ADT bundles download path in the CS template.Ricardo Cervera2014-03-251-31/+31
| | | | | | | | | | | | | | | | Change-Id: Ib222684754779b908cb10e6d8f9e5778101c9b96
| * | | am bb79f9d2: am b7b49711: add some css to support android wear sub-siteScott Main2014-03-181-0/+22
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'bb79f9d2a52c7f1e20bd74e5d80b2df4119cec82': add some css to support android wear sub-site
| | * | am b7b49711: add some css to support android wear sub-siteScott Main2014-03-181-0/+22
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'b7b497115fb19d17a3e5de20646a5eac759c0095': add some css to support android wear sub-site
| | | * add some css to support android wear sub-siteScott Main2014-03-181-0/+22
| | | | | | | | | | | | | | | | Change-Id: Ibce2c596219fb86f433075c88a0af9d0cc1007b3
| * | | am 25f47659: am 05192e5a: Merge "Docs: replacing analytics ID from D.A.C. ↵Clay Murphy2014-03-114-19/+29
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11476435" * commit '25f47659d7cc0e7b9d65ab8ce070fc7b00c4976c': Docs: replacing analytics ID from D.A.C. Bug: 11476435
| * \ \ \ am cd958154: Merge "Refactor a little bit and do the validation on also ↵Ying Wang2014-03-071-31/+47
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default.prop." * commit 'cd958154a5bdb753274a338e799c3ece96ea9c5c': Refactor a little bit and do the validation on also default.prop.
| * \ \ \ \ am de90b030: Merge "A build property\'s value is returned empty in runtime ↵Ying Wang2014-03-071-1/+32
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message." * commit 'de90b0307a603449354bb2d265c5b2315b7b6850': A build property's value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message.
| * \ \ \ \ \ am 5c92d966: am 541b4941: New temporary templates set for dynamic content ↵Dirk Dougherty2014-02-15190-0/+17294
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support. * commit '5c92d966076b28024a9efd6c8456445e207748f1': New temporary templates set for dynamic content support.
| | * | | | | am 541b4941: New temporary templates set for dynamic content support.Dirk Dougherty2014-02-15190-0/+17294
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | * commit '541b494103857da31505ba745b0da5bdbe0499b9': New temporary templates set for dynamic content support.
| | | * | | | New temporary templates set for dynamic content support.Dirk Dougherty2014-02-14190-0/+17294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I066e43cdebaf66c0d8b5e3622a286dc2c88c47b5
| * | | | | | am 22866695: am 2c2c0534: set a smaller line height for sidebox headers to ↵Scott Main2014-02-121-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avoid whitespace at the top * commit '228666956ade81aa8f993eed70f361ec93073bad': set a smaller line height for sidebox headers to avoid whitespace at the top
| | * | | | | am 2c2c0534: set a smaller line height for sidebox headers to avoid ↵Scott Main2014-02-121-0/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whitespace at the top * commit '2c2c053490aa3a2102c0dce95fcae0d22b77a71b': set a smaller line height for sidebox headers to avoid whitespace at the top
| | | * | | | set a smaller line height for sidebox headers to avoid whitespace at the topScott Main2014-02-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8f1c4de275f3d7b2f55460bf4dc32a9a3d6b04ae
| * | | | | | am f72e1846: am c9e142e6: Merge "add \'get started\' link to the bottom of ↵Scott Main2014-01-292-17/+30
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class home pages" into klp-docs * commit 'f72e1846898ec07cedf301ac76875cfa9f1164bc': add 'get started' link to the bottom of class home pages
| | * | | | | am c9e142e6: Merge "add \'get started\' link to the bottom of class home ↵Scott Main2014-01-292-17/+30
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pages" into klp-docs * commit 'c9e142e62d60b39bb5bd3459358a16c00fc557f3': add 'get started' link to the bottom of class home pages
| | | * | | | Merge "add 'get started' link to the bottom of class home pages" into klp-docsScott Main2014-01-292-17/+30
| | | |\ \ \ \
| | | | * | | | add 'get started' link to the bottom of class home pagesScott Main2014-01-232-17/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0f4615562efca083e7d1c50bb9e9eaa2cc250ced
| * | | | | | | resolved conflicts for merge of 7382ec7d to klp-dev-plus-aospYing Wang2014-01-271-5/+13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic414d3ec8b52b1045125e1b76deae8a4a59a5e52
| * \ \ \ \ \ \ \ am 0bb2c170: Merge commit \'bb94d790\' into manualmergeDirk Dougherty2014-01-221-1/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '0bb2c1702a0ca2b174b70ac2d5364548453ba524': Support generated samples_toc.cs file.
| | * | | | | | | Merge commit 'bb94d790' into manualmergeDirk Dougherty2014-01-221-1/+1
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/droiddoc/templates-sdk/sample.cs Change-Id: Ic1640c3620eb6b770bae7766af9ea5c64d74afe0
| | | * | | | | | Support generated samples_toc.cs file.Dirk Dougherty2014-01-232-7/+3
| | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d239e4c9b5c154129d67bec9cd7b37b2720bf2b6) Change-Id: I3409d7d3beefaacb7d56e15a47597241d257c213
| | | * | | | | Added a row for the "All platforms" download line (rebuild stl with debug ↵David Friedman2013-12-191-21/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info package) Change-Id: I333912e697a389b52b5c768e1218b7d146775c9f (cherry picked from commit c25aee29298f1c1658fb274be15724ce60c0b93e)
| * | | | | | | am a80542db: am 4038aa8f: Enabled incrementals to patch + rename moved filesMichael Runge2013-12-262-13/+101
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a80542dbf4f193c59525b8749871bcdf4ae4283a': Enabled incrementals to patch + rename moved files
| | * | | | | | am 4038aa8f: Enabled incrementals to patch + rename moved filesMichael Runge2013-12-202-13/+101
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4038aa8fff8c68733bff8b55d8c8d1b59713ca37': Enabled incrementals to patch + rename moved files
| | | * | | | | | Enabled incrementals to patch + rename moved filesMichael Runge2013-12-162-13/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I551fc5291847e3ace15361c203d86f566c26da97
| * | | | | | | | am bf9d72ff: am 07816041: set fixed height for header div to ensure the ↵Scott Main2013-12-191-1/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | next/prev links in the training bar are always aligned with TOC * commit 'bf9d72ff4d6952c0546a2bf249938dfbe4f7768e': set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
| | * | | | | | | am 07816041: set fixed height for header div to ensure the next/prev links ↵Scott Main2013-12-191-1/+5
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the training bar are always aligned with TOC * commit '078160410ad4209fb78f59ae8e04a6118914cdb5': set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
| | | * | | | | | set fixed height for header div to ensure the next/prev linksScott Main2013-12-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the training bar are always aligned with TOC Change-Id: I34bb1967e3677bc94298837b0d8f0c6e7bcd8bbf
| * | | | | | | | am dab6ac86: am 518dc751: Merge "make the new guide/index.html the link for ↵Scott Main2013-12-171-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API Guides." into klp-docs * commit 'dab6ac86013bb9507a59b74abe1b11ab2306f352': make the new guide/index.html the link for API Guides.
| | * | | | | | | am 518dc751: Merge "make the new guide/index.html the link for API Guides." ↵Scott Main2013-12-171-2/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-docs * commit '518dc751a617c1f182cb01cdc8fd06076d1e91ba': make the new guide/index.html the link for API Guides.
| | | * | | | | | Merge "make the new guide/index.html the link for API Guides." into klp-docsScott Main2013-12-171-2/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | make the new guide/index.html the link for API Guides.Scott Main2013-12-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4423e9ab43b349427cc70211dd094760b35e9360
| * | | | | | | | | am 2c8078fd: Merge "Fix regex for finding symbol data."Christopher Ferris2013-12-121-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2c8078fdcc7741d848444a01cd81e5dfb8693f15': Fix regex for finding symbol data.
| * \ \ \ \ \ \ \ \ \ am 9b022bdf: am 35fe9894: Merge "Doc change: Add tag for DevArt." into klp-docsDirk Dougherty2013-12-113-0/+31
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b022bdf8fba6fd3f2185a303e0bf3b3aa2e3d9e': Doc change: Add tag for DevArt.
| | * | | | | | | | | am 35fe9894: Merge "Doc change: Add tag for DevArt." into klp-docsDirk Dougherty2013-12-113-0/+31
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '35fe9894d283153b0a72741e207a586ff70cd558': Doc change: Add tag for DevArt.
| | | * | | | | | | | Merge "Doc change: Add tag for DevArt." into klp-docsDirk Dougherty2013-12-113-0/+31
| | | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Doc change: Add tag for DevArt.Dirk Dougherty2013-12-033-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id6ecac1587e311373b2f787fb86b85c2c9933183
| * | | | | | | | | | am d270230f: Merge "sign_target_files_apks: rewrite build.prop correctly in ↵Ying Wang2013-12-111-2/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eng builds" * commit 'd270230fa49311901d8797a9e77865c37857d028': sign_target_files_apks: rewrite build.prop correctly in eng builds
| * \ \ \ \ \ \ \ \ \ \ am ecff92d9: resolved conflicts for merge of 79a55d35 to klp-ub-devScott Main2013-12-101-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ecff92d9f7d58b619465259213d7a58ae01c2872': add Analytics event to track sample downloads (for real this time)
| | * | | | | | | | | | resolved conflicts for merge of 79a55d35 to klp-ub-devScott Main2013-12-101-3/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | Change-Id: I95f46942e03f125e1a907003520caaf6ab575016
| | | * | | | | | | | | add Analytics event to track sample downloads (for real this time)Scott Main2013-12-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I014fd31f0f12698462d44a8afed96ca6e3cfef38