tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
11200 commits 1 branch 0 tags 119 MiB
Commit graph

1461 commits

Author SHA1 Message Date
Jean-Baptiste Queru
5ac65f8696 Merge "Fix reporting wrong error message for zipalign output file" 2012-08-23 14:52:41 -07:00
Andrew Hsieh
cd3050c541 am 4d69e06b: Merge "Added BUILD_HOST_static to build statically linked executable/shared-lib" 
* commit '4d69e06b764d030dcc3ce9bc8b103a75eff3175a':
  Added BUILD_HOST_static to build statically linked executable/shared-lib
 2012-08-21 12:58:45 -07:00
Doug Zongker
b32161a2a5 change recovery partition construction to use resource .dat 
When /system/etc/recovery-resource.dat is available, use it to
construct the recovery-from-boot patch.

Change-Id: I1575f7d284711323186ca6823842eb2a866fd890
 2012-08-21 10:33:44 -07:00
Andrew Hsieh
31ef1037bf Added BUILD_HOST_static to build statically linked executable/shared-lib 
Statically linked executable/shared-lib (eg. SDK tools) are useful
in sandboxed environment.

In BUILD_HOST_static zipalign needs -lpthread indirectly:
zipalign->libutils.a->liblog.a->logd_write.c->pthread

Change-Id: I615f574e918c83ed1ab82db2453b69d0420cb59c
 2012-08-21 14:40:16 +08:00
Scott Main
1e44894605 am 50187e53: am f5089846: docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change 9edfa6db8c 
* commit '50187e53450fba54131e5d5857e5f05cb6b0e849':
  docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change 9edfa6db8c
 2012-08-20 17:02:56 -07:00
Scott Main
50187e5345 am f5089846: docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change 9edfa6db8c 
* commit 'f5089846a1876f8e976d4bd1ddf383d3ed68d558':
  docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change 9edfa6db8c
 2012-08-20 17:01:19 -07:00
Jingwen Owen Ou
303213915d Fix reporting wrong error message for zipalign output file 
The problem is due to using variable inFileName instead of outFileName for printing out error message for output file.

Change-Id: Ie53a21b077fea5e7cd106fe6884cea159d2629a2
 2012-08-17 16:21:11 -07:00
Doug Zongker
6937a44742 Merge "load SYSTEM/build.prop into the info_dict" into jb-mr1-dev 2012-08-17 13:15:28 -07:00
Joe Onorato
cea08a5220 resolved conflicts for merge of 5836d3b3 to jb-mr1-dev 
Change-Id: If3d84a7439717ccf7723b3f79e934d73abbb3fea
 2012-08-17 00:09:27 -07:00
Joe Onorato
5836d3b3d9 am f72e34eb: Merge changes I9d3a3c16,I17b5d441,I29e27505,Ia5ca233e,I0a0b200b,I6f412ed4,I623821df,Ifec8e63e,I12d0a847,Idac551e5,I59a88027,I2498139d,I6bd93a87 
* commit 'f72e34ebf49ed2a06fe9e37d134f2088e2c0c0e4':
  Move the old user tagged modules over to base.mk so mini and core both share them.
  More product debugging.
  build system changes for jb-aah-dev merge
  Fail when a non-vendor product references a vendor module.
  Remove support for user tags in the build system.
  List the user modules explicitly, and we can get rid of the support for the user tag!
  Dump the user tagged modules.
  host modules don't need LOCAL_MODULE_TAGS
  Don't give the user tag to host modules automatically.
  Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.
  Add tool to parse make dependency info from new --deps flag.
  Use a more modern -j flag.
  make product-graph now filtered
 2012-08-16 23:50:34 -07:00
Joe Onorato
f3319452ad More product debugging. 
Change-Id: I17b5d441e44ea39564263b32f963e2d3ac684232
 2012-08-16 22:36:41 -07:00
Joe Onorato
b4da6b50fe host modules don't need LOCAL_MODULE_TAGS 
Change-Id: Ifec8e63eef512b281eb924ef92160e9e1bf97f6d
 2012-08-16 22:36:40 -07:00
Joe Onorato
cc788043b7 Add tool to parse make dependency info from new --deps flag. 
Change-Id: I59a88027d88cceee9f2933c84379612698952043
 2012-08-16 22:36:40 -07:00
Joe Onorato
6ea77a2dc8 Use a more modern -j flag. 
Change-Id: I2498139dd41637a795ca43f830c952adb2856d83
 2012-08-16 22:36:40 -07:00
Joe Onorato
f5debbfee6 make product-graph now filtered 
Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208
 2012-08-16 22:36:40 -07:00
Doug Zongker
1eb74dd9a0 load SYSTEM/build.prop into the info_dict 
Change-Id: Ic747106ba11773ffc9c2eebc163cfd22b1d7a4d5
 2012-08-16 16:19:00 -07:00
Scott Main
f5089846a1 docs: combine all possible js files into one to reduce the number of requests 
Also make change to doc template and css to fix footer layout bug introduced
by change 9edfa6db8c

Change-Id: Icfb1b499abfca6a39b5bff8fab576b14a1cf960a
 2012-08-15 14:47:50 -07:00
Scott Main
d3ee366af2 am 021ff2ee: am 9edfa6db: docs: move home.css into default.css to reduce number of requests 
* commit '021ff2ee388bdb548ae55b349535d14e0423207c':
  docs: move home.css into default.css to reduce number of requests
 2012-08-14 18:12:02 -07:00
Scott Main
021ff2ee38 am 9edfa6db: docs: move home.css into default.css to reduce number of requests 
* commit '9edfa6db8c53ef9515aaeed734bea02c5d65e1e5':
  docs: move home.css into default.css to reduce number of requests
 2012-08-14 18:10:52 -07:00
Doug Zongker
24cd280328 allow diff program to be selected explicitly 
Change-Id: I1d8df9cc3ed35cc5983bc50fc13975db32072dbe
 2012-08-14 16:36:15 -07:00
Scott Main
9edfa6db8c docs: move home.css into default.css to reduce number of requests 
Change-Id: I156182c5ad1545f570808af565948cbd3c05a3ee
 2012-08-14 16:28:45 -07:00
Scott Main
0207498d6e am c8b7dfb1: am 0e71cee2: docs: make landing pages w/o image span the full page width 
* commit 'c8b7dfb1e308d7dbe426724d21b932b8b79d9ab5':
  docs: make landing pages w/o image span the full page width
 2012-08-08 12:50:59 -07:00
Scott Main
c8b7dfb1e3 am 0e71cee2: docs: make landing pages w/o image span the full page width 
* commit '0e71cee2bbe5aac3a5e502936cac46b830af0067':
  docs: make landing pages w/o image span the full page width
 2012-08-08 12:48:58 -07:00
Scott Main
0e71cee2bb docs: make landing pages w/o image span the full page width 
Change-Id: I96af0c7e1443079820c44b589b0c3ef638ae9c86
 2012-08-07 13:59:43 -07:00
Scott Main
aad5e32f6a am fe50d923: am 9332a459: docs: comment-out unused style (the png currently does not resolve) 
* commit 'fe50d92396f00e07bc77be1e95ffb5c8b0c989bd':
  docs: comment-out unused style (the png currently does not resolve)
 2012-08-06 18:58:36 -07:00
Scott Main
fe50d92396 am 9332a459: docs: comment-out unused style (the png currently does not resolve) 
* commit '9332a459186e467aba6b3b9b8c16e0fd3dc84860':
  docs: comment-out unused style (the png currently does not resolve)
 2012-08-06 18:56:45 -07:00
Scott Main
9332a45918 docs: comment-out unused style (the png currently does not resolve) 
Change-Id: I665068f0808a81c98cbd0685f68ed7f4df4cf0e0
 2012-08-06 18:54:18 -07:00
Doug Zongker
d513160b76 add extra args to mkbootimg 
Arrange to take $(BOARD_MKBOOTIMG_ARGS) and pass it to all invocations
of mkbootimg from within make, and to store it in the target_files so
it can be used by future invocations of img_from_target_files and
ota_from_target_files.

Bug: 6918260
Change-Id: I7130ac52e96bd51d4d8b80ca036635e1626f01f1
 2012-08-02 15:03:41 -07:00
Roman Nurik
f5bd3bce67 am 2461af44: am c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev 
* commit '2461af44c1c1e2684b56e7c9c62fb69cc42b10e5':
  Improve print stylesheet for d.a.c.
 2012-08-01 14:48:36 -07:00
Roman Nurik
2461af44c1 am c9e30dce: Merge "Improve print stylesheet for d.a.c." into jb-dev 
* commit 'c9e30dce7c7709a1d8b54bd9f2037e5fc8ff992f':
  Improve print stylesheet for d.a.c.
 2012-08-01 12:41:10 -07:00
Roman Nurik
c9e30dce7c Merge "Improve print stylesheet for d.a.c." into jb-dev 2012-08-01 12:39:19 -07:00
Roman Nurik
393830e7b7 Improve print stylesheet for d.a.c. 
- Improve printed page margins
- Hide navigational elements
- Print link URLs
- Improve spacing on key elements

Change-Id: Ic487e00636b1d06f15d7a29b4162c9e31f5569b1
 2012-08-01 12:21:16 -07:00
Scott Main
72972445f2 am b736e07c: am 2ccbd3f8: change "nolist" style to be simply remove bullets and indent; leave the rest alone. 
* commit 'b736e07cbb9b0b3c0ccdc6352a10b36d244aebbc':
  change "nolist" style to be simply remove bullets and indent; leave the rest alone.
 2012-08-01 12:15:24 -07:00
Scott Main
b736e07cbb am 2ccbd3f8: change "nolist" style to be simply remove bullets and indent; leave the rest alone. 
* commit '2ccbd3f8d44bbc9b7a542144751767fe093083e7':
  change "nolist" style to be simply remove bullets and indent; leave the rest alone.
 2012-08-01 12:12:51 -07:00
Scott Main
2ccbd3f8d4 change "nolist" style to be simply remove bullets and indent; leave the rest alone. 
Change-Id: Iccde983bf31338752f83ac72c0cdc543b4faf12a
 2012-08-01 12:05:12 -07:00
Scott Main
ff8d3674ab am 37132103: am a8d7485d: Merge "add script to create links on topic landing page for first doc that use the doc\'s title" into jb-dev 
* commit '37132103a2d60c7ceb0ede1f34d8b3c633d7c09e':
  add script to create links on topic landing page for first doc that use the doc's title
 2012-07-31 12:47:42 -07:00
Scott Main
37132103a2 am a8d7485d: Merge "add script to create links on topic landing page for first doc that use the doc\'s title" into jb-dev 
* commit 'a8d7485de2d43e2c9c77ed62638174742bc66d1f':
  add script to create links on topic landing page for first doc that use the doc's title
 2012-07-31 12:45:28 -07:00
Scott Main
a8d7485de2 Merge "add script to create links on topic landing page for first doc that use the doc's title" into jb-dev 2012-07-31 12:43:29 -07:00
Scott Main
b505ca6db5 add script to create links on topic landing page for first doc that use the doc's title 
Change-Id: Iec86a5b9fa7dcd9246d6e8958f17e0022e0963a8
 2012-07-30 17:04:11 -07:00
Scott Main
5096823405 am 42950013: am 54d2a9b9: add bottom-margin to div-based notes 
* commit '42950013b7b80a085443d99c1676912f1398b752':
  add bottom-margin to div-based notes
 2012-07-24 22:05:48 -07:00
Scott Main
42950013b7 am 54d2a9b9: add bottom-margin to div-based notes 
* commit '54d2a9b9ec90d3e4697f7915a183d8cfcc7e20b0':
  add bottom-margin to div-based notes
 2012-07-24 22:01:18 -07:00
Scott Main
54d2a9b9ec add bottom-margin to div-based notes 
Change-Id: I4c74ab362b00bfb68093a975171f777e3fb5eef9
 2012-07-24 14:54:32 -07:00
Scott Main
375b606314 am 905a015c: am 06cb5c73: Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule 
* commit '905a015c99816122e92d5e59f02efab8e2194958':
  Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule
 2012-07-23 19:52:35 -07:00
Scott Main
905a015c99 am 06cb5c73: Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule 
* commit '06cb5c73f3f62a2da0138d3f55e19c47a2632182':
  Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule
 2012-07-23 14:38:57 -07:00
Scott Main
06cb5c73f3 Set the min height and width for images in carousel, set height of tabs so the selected indicator aligns with horizontal rule 
Change-Id: I0283e2634713d3fb6c99b465687c605e32a776f3
 2012-07-23 14:34:34 -07:00
Scott Main
74aa3e49c4 am a24cd5eb: am b72b7b84: Merge "docs: further specify design docs\' list styles to fix uls appearing like ols" into jb-dev 
* commit 'a24cd5ebf0476c003fa97acb8eedbc9939166bca':
  docs: further specify design docs' list styles to fix uls appearing like ols
 2012-07-19 11:14:58 -07:00
Scott Main
a24cd5ebf0 am b72b7b84: Merge "docs: further specify design docs\' list styles to fix uls appearing like ols" into jb-dev 
* commit 'b72b7b84b6c0c3a59da6f34531b362782090cabf':
  docs: further specify design docs' list styles to fix uls appearing like ols
 2012-07-19 11:13:41 -07:00
Scott Main
b72b7b84b6 Merge "docs: further specify design docs' list styles to fix uls appearing like ols" into jb-dev 2012-07-19 11:03:42 -07:00
Scott Main
b9ae92b401 docs: further specify design docs' list styles to fix uls appearing like ols 
Change-Id: I203daeafb390532e34687338d5c3d4a307ba680f
 2012-07-19 11:01:27 -07:00
Scott Main
1a69876fb3 am 3fae8d4e: am 71b28a60: Merge "docs: add check in hash-change callback to be sure we\'re only dealing with hash-tags that are search queries. bug: 6843654" into jb-dev 
* commit '3fae8d4e5685e604cc1dcc3c72745d6b521cfdc1':
  docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug: 6843654
 2012-07-18 20:17:48 -07:00
Scott Main
0a798c2097 am 57267e56: am 55163c88: Doc change: add links to the More menu. 
* commit '57267e567f011d9db838b1a46be1290e563d6f77':
  Doc change: add links to the More menu.
 2012-07-18 20:17:47 -07:00
Scott Main
3fae8d4e56 am 71b28a60: Merge "docs: add check in hash-change callback to be sure we\'re only dealing with hash-tags that are search queries. bug: 6843654" into jb-dev 
* commit '71b28a600e52922a7a18b990f256b2fa104d32e8':
  docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug: 6843654
 2012-07-18 20:14:58 -07:00
Scott Main
57267e567f am 55163c88: Doc change: add links to the More menu. 
* commit '55163c882e8d97d48f58f8ac86c394ce07548d8c':
  Doc change: add links to the More menu.
 2012-07-18 20:14:03 -07:00
Scott Main
71b28a600e Merge "docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. bug: 6843654" into jb-dev 2012-07-18 16:59:41 -07:00
Scott Main
7f527b3f44 docs: add check in hash-change callback to be sure we're only dealing with hash-tags that are search queries. 
bug: 6843654

Change-Id: I5fee7426d8ad404a5f03f37297fe72009df30de7
 2012-07-18 16:58:29 -07:00
Scott Main
55163c882e Doc change: add links to the More menu. 
Change-Id: I77e848f86278781b0a44eb672ea711e00352fde5
 2012-07-18 16:18:25 -07:00
Scott Main
67f570576d am e09cf926: am 1d62fa80: docs: bring back min-height for nav-x for proper height of secondary tabs 
* commit 'e09cf926325c78b4c2885df83003d1e1c812f94c':
  docs: bring back min-height for nav-x for proper height of secondary tabs
 2012-07-17 14:11:53 -07:00
Scott Main
e09cf92632 am 1d62fa80: docs: bring back min-height for nav-x for proper height of secondary tabs 
* commit '1d62fa807e1ac2c4f9ad8f31f34809ec97e975ed':
  docs: bring back min-height for nav-x for proper height of secondary tabs
 2012-07-17 13:22:25 -07:00
Scott Main
1d62fa807e docs: bring back min-height for nav-x for proper height of secondary tabs 
Change-Id: I865195b9fde9ec64fbe2c083c0d3617a55b54a0f
 2012-07-17 13:15:12 -07:00
Scott Main
71d41178b9 am b8910812: am a214d84f: docs: upgrades to search. Fix history navigation functionality. Faster ajax requery while typing. Ignore ENTER key when performing requery to avoid reload. Improve results reveal with minimum height for proper div. 
* commit 'b8910812fdd0bb2105738b6b24fc0b9e4b201956':
  docs: upgrades to search. Fix history navigation functionality. Faster ajax requery while typing. Ignore ENTER key when performing requery to avoid reload. Improve results reveal with minimum height for proper div.
 2012-07-16 18:41:46 -07:00
Scott Main
b8910812fd am a214d84f: docs: upgrades to search. Fix history navigation functionality. Faster ajax requery while typing. Ignore ENTER key when performing requery to avoid reload. Improve results reveal with minimum height for proper div. 
* commit 'a214d84ff82bb3ae279b1f2c8ece5f65656b5e5c':
  docs: upgrades to search. Fix history navigation functionality. Faster ajax requery while typing. Ignore ENTER key when performing requery to avoid reload. Improve results reveal with minimum height for proper div.
 2012-07-16 18:38:14 -07:00
Scott Main
a214d84ff8 docs: upgrades to search. 
Fix history navigation functionality.
Faster ajax requery while typing.
Ignore ENTER key when performing requery to avoid reload.
Improve results reveal with minimum height for proper div.

Change-Id: Ie50a6d7bdf58ad3e17dd15d30dcec973a123b7bf
 2012-07-16 18:12:22 -07:00
Scott Main
5f51f8a281 am 8f4df715: am 220c3449: docs: adjust spacing for collapsible sections (release notes) 
* commit '8f4df715b8a74b9df1b0560d910f1dabd86dbf9d':
  docs: adjust spacing for collapsible sections (release notes)
 2012-07-16 15:50:13 -07:00
Scott Main
8f4df715b8 am 220c3449: docs: adjust spacing for collapsible sections (release notes) 
* commit '220c34492ae24f79f9b4a4fe15051360c8505807':
  docs: adjust spacing for collapsible sections (release notes)
 2012-07-16 15:46:46 -07:00
Scott Main
220c34492a docs: adjust spacing for collapsible sections (release notes) 
Change-Id: I68c8429e0e18bff50463b40f163df6a89ac8730a
 2012-07-16 15:40:17 -07:00
Doug Zongker
19e185e148 Merge "make SignApk faster for OTA packages" 2012-07-03 15:57:57 -07:00
Doug Zongker
e691373514 make SignApk faster for OTA packages 
Change to the default compression level instead of the max compression
level for OTA packages (-w): it's much faster and the difference in
output size is usually negligible.

Bug: 6778962
Change-Id: I82a6acc19be8b3289fd84c8c15f03ebeb7a1ce63
 2012-07-03 15:03:04 -07:00
Scott Main
37a21f82bf am a4d57eab: am 38f19c21: Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev 
* commit 'a4d57eab27139af93ecdb4b0eb8ec8c5193b7c80':
  docs: fix search suggestions and other script bugs for offline docs
 2012-07-03 14:18:10 -07:00
Scott Main
a4d57eab27 am 38f19c21: Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev 
* commit '38f19c21258592faefa652d4871d570e151a2a53':
  docs: fix search suggestions and other script bugs for offline docs
 2012-07-03 14:15:43 -07:00
Scott Main
38f19c2125 Merge "docs: fix search suggestions and other script bugs for offline docs" into jb-dev 2012-07-03 14:10:57 -07:00
Scott Main
1b3db11e6e docs: fix search suggestions and other script bugs for offline docs 
Change-Id: I3f9404695966b99be1c8ed36249788e448399296
 2012-07-03 14:06:22 -07:00
Scott Main
cf0c34d481 am 082ca3f2: am f973ced3: docs: better message for download page when os detection fails 
* commit '082ca3f2de07ee6183343452a35f4afe2cdb7f3d':
  docs: better message for download page when os detection fails
 2012-06-28 12:06:35 -07:00
Scott Main
082ca3f2de am f973ced3: docs: better message for download page when os detection fails 
* commit 'f973ced37e2d065c0aa41bb5563abad7518bea61':
  docs: better message for download page when os detection fails
 2012-06-28 12:01:03 -07:00
Scott Main
f973ced37e docs: better message for download page when os detection fails 
Change-Id: I940c0847ddc214ef36bfd0708d289cff200dfc62
 2012-06-28 11:56:01 -07:00
Scott Main
260e893588 am 3fa1173a: am 810e2889: docs: fix overlapping sidebar bug, but I think this re-introduces a bug in IE where the sidenav position moves slightly left/right during scroll, but it\'s a worthwhile compromise and will investigate a diff solution for that later. 
* commit '3fa1173ac3a24214a6f8bc5e6cf9794226110f9b':
  docs: fix overlapping sidebar bug, but I think this re-introduces a bug in IE where the sidenav position moves slightly left/right during scroll, but it's a worthwhile compromise and will investigate a diff solution for that later.
 2012-06-27 02:27:29 -07:00
Scott Main
3fa1173ac3 am 810e2889: docs: fix overlapping sidebar bug, but I think this re-introduces a bug in IE where the sidenav position moves slightly left/right during scroll, but it\'s a worthwhile compromise and will investigate a diff solution for that later. 
* commit '810e28891457af6e365b839ac584d77277b2e3fa':
  docs: fix overlapping sidebar bug, but I think this re-introduces a bug in IE where the sidenav position moves slightly left/right during scroll, but it's a worthwhile compromise and will investigate a diff solution for that later.
 2012-06-27 02:25:12 -07:00
Scott Main
810e288914 docs: fix overlapping sidebar bug, 
but I think this re-introduces a bug in IE where the sidenav
position moves slightly left/right during scroll, but it's a
worthwhile compromise and will investigate a diff solution for that later.

Change-Id: Id1f2141b6638e199d1a4ad1d198a5a5aa45bf264
 2012-06-27 02:08:20 -07:00
Scott Main
e9327a67bc am dfc602e0: am 03c972c5: docs: misc css 
* commit 'dfc602e0d90601be5c6fd4558c6046ef596c0a3b':
  docs: misc css
 2012-06-26 22:28:46 -07:00
Scott Main
dfc602e0d9 am 03c972c5: docs: misc css 
* commit '03c972c5c6d42597c8fe0127161d6536ee98d04b':
  docs: misc css
 2012-06-26 22:26:18 -07:00
Scott Main
03c972c5c6 docs: misc css 
Change-Id: I398d30f9414564f58ea3546a192ad1c12e715349
 2012-06-26 22:23:22 -07:00
Scott Main
3e00da82ea am c60a1430: am 9ada2264: docs: darker font color 
* commit 'c60a1430dcfc7e8ae25b31800620c833a427895a':
  docs: darker font color
 2012-06-23 17:55:26 -07:00
Scott Main
c60a1430dc am 9ada2264: docs: darker font color 
* commit '9ada22647890c18ded2b890d00c0a307bd2bed98':
  docs: darker font color
 2012-06-23 17:52:58 -07:00
Scott Main
9ada226478 docs: darker font color 
Change-Id: I8fe4117ac501001dd6c7156b337f3ff7a4f75793
 2012-06-23 14:59:36 -07:00
Scott Main
978cc24532 am 46601e37: am 6a7a66be: docs: try darker text and shorter line height 
* commit '46601e379201f6e14be9ec1f7f170e633430344a':
  docs: try darker text and shorter line height
 2012-06-23 11:27:00 -07:00
Scott Main
46601e3792 am 6a7a66be: docs: try darker text and shorter line height 
* commit '6a7a66beba12d6e655f3dde257a3e4964f8ad0c7':
  docs: try darker text and shorter line height
 2012-06-23 11:25:21 -07:00
Scott Main
6a7a66beba docs: try darker text and shorter line height 
Change-Id: I7fe3cdc0a0f5cdfd8bcb69b1e1a2d11d8b5301d3
 2012-06-23 11:20:48 -07:00
Scott Main
1df3271e64 am aeda97cb: am d786a29f: docs: adjust homepage carousel styles 
* commit 'aeda97cb22f64badf50bf31ca11e4f32418fc6d8':
  docs: adjust homepage carousel styles
 2012-06-23 05:39:13 -07:00
Scott Main
608f34f324 am ac432bc9: am 25659b02: docs: update sdk template to support new ndk doc layout 
* commit 'ac432bc99516543889c007a2eb09aa64afd5fdc0':
  docs: update sdk template to support new ndk doc layout
 2012-06-23 05:39:13 -07:00
Scott Main
53ceaab227 am 04977dbb: am 412eaf20: docs: style changes for notes 
* commit '04977dbbb61af360c6c0efea9accdb12cf2a3598':
  docs: style changes for notes
 2012-06-23 05:39:12 -07:00
Scott Main
aeda97cb22 am d786a29f: docs: adjust homepage carousel styles 
* commit 'd786a29f14c502986ffc160471daedfd0b5fb5dc':
  docs: adjust homepage carousel styles
 2012-06-23 05:37:01 -07:00
Scott Main
ac432bc995 am 25659b02: docs: update sdk template to support new ndk doc layout 
* commit '25659b0217cca1389b2711ee536547b20b266319':
  docs: update sdk template to support new ndk doc layout
 2012-06-23 05:37:01 -07:00
Scott Main
04977dbbb6 am 412eaf20: docs: style changes for notes 
* commit '412eaf202c63b8d2cc32b5b865ba29155e047697':
  docs: style changes for notes
 2012-06-23 05:36:51 -07:00
Scott Main
d786a29f14 docs: adjust homepage carousel styles 
Change-Id: Id2b32ce67d26a19b40e7944a5dd37cd17d8eec2a
 2012-06-22 21:23:32 -07:00
Scott Main
25659b0217 docs: update sdk template to support new ndk doc layout 
Change-Id: I47ec2fcd4b7116fa3dc59483a434d7f188f984d1
 2012-06-22 17:02:25 -07:00
Scott Main
412eaf202c docs: style changes for notes 
Change-Id: I13bc3f19780421a30feffc6e6ffe19cfadc886e5
 2012-06-22 14:36:33 -07:00
Scott Main
0ed11e1556 am 84e518eb: am f9b799b5: cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df return old analytics script 
* commit '84e518ebcd0e9edd4b27ea5f7be181d4532e88b5':
  cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df return old analytics script
 2012-06-22 10:34:06 -07:00
Scott Main
84e518ebcd am f9b799b5: cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df return old analytics script 
* commit 'f9b799b5ba0ed5d06c8bf442ddd4319c93fbc95f':
  cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df return old analytics script
 2012-06-22 10:31:44 -07:00
Scott Main
f9b799b5ba cherrypick from ics Change-Id: I07b59de3f2e4a5fef2e8722d7f7ab159ded8b2df 
return old analytics script

Change-Id: Ica4abe000b529272efa9ba7867b3e7aa6c8c9e55
 2012-06-22 10:28:47 -07:00
Scott Main
c698165a21 am d86c00b6: am e4d8f1b1: Massive clobber of all template files in developer site for new design 
* commit 'd86c00b66666b700afac0b2396e2d81e583bd0ef':
  Massive clobber of all template files in developer site for new design
 2012-06-21 21:35:28 -07:00
Scott Main
d86c00b666 am e4d8f1b1: Massive clobber of all template files in developer site for new design 
* commit 'e4d8f1b1f5a6e2308bfeff04d7fa51ff7394c644':
  Massive clobber of all template files in developer site for new design
 2012-06-21 21:32:44 -07:00
Scott Main
e4d8f1b1f5 Massive clobber of all template files in developer site for new design 
Change-Id: I5f243dcb377a8b2e573c404a9e685cc64e0e06d2
 2012-06-21 21:29:11 -07:00
Raphael Moll
ebde54b265 am 748f9e38: am b53a073d: am e375c940: Merge "SDK: Use "strip -x" for atree." 
* commit '748f9e3804834610a59081db4c2952dcb7ee00d4':
  SDK: Use "strip -x" for atree.
 2012-06-07 13:12:04 -07:00
Raphael Moll
748f9e3804 am b53a073d: am e375c940: Merge "SDK: Use "strip -x" for atree." 
* commit 'b53a073ddb3a5036f41ea2956792991b7a46da02':
  SDK: Use "strip -x" for atree.
 2012-06-07 13:08:58 -07:00
Raphael Moll
b53a073ddb am e375c940: Merge "SDK: Use "strip -x" for atree." 
* commit 'e375c940b9210ea514227b0ee8cfb896d7f11d93':
  SDK: Use "strip -x" for atree.
 2012-06-07 13:06:23 -07:00
Raphael Moll
ec5fe91ead SDK: Use "strip -x" for atree. 
Also fixes atree to accept an alternate command via the env var ATREE_STRIP
and correctly splits it for execvp if it contains arguments.

Change-Id: I8691bdc569bea3dddfde6249217dc305b6ef19f7
 2012-06-06 23:39:47 -07:00
Ying Wang
d5ba4064c3 am f521a8e8: am 6afbda9f: Merge "Clean common intermediate files if overlay changed" into jb-dev 
* commit 'f521a8e888a425dcd5fff70d18d14c9324e2d3aa':
  Clean common intermediate files if overlay changed
 2012-06-06 09:47:25 -07:00
Ying Wang
71004f8135 Clean common intermediate files if overlay changed 
This change cleans the packages' intermediate files if their overlays
changed between incremental builds.
If two builds have different overlay, they will have different R
classes, and so the jar files in the common intermediate dirs can
not be shared. Therefore incremental build can't be applied.

This change detects the overlay changes on package's base.
If a package's overlay is different from the previous build, its common
intermediate dir is nuked.
This makes broader incremental builds possible.

Change-Id: I368610ebbbbc85a80f9aecd714ab22cd78da7f12
 2012-06-04 18:02:55 -07:00
Doug Zongker
7d25823b2d am 31ee627e: am 7bb04231: add copy of public cert used for signing to OTA packages 
* commit '31ee627e729a8b7bb1b60cf73d724231e06be3d7':
  add copy of public cert used for signing to OTA packages
 2012-05-14 07:26:15 -07:00
Doug Zongker
7bb042317a add copy of public cert used for signing to OTA packages 
When signing a file with -w (ie, an OTA package), add the file
META-INF/com/android/otacert, which is a copy of the public key
certificate.  While this can be extracted from the CERT.RSA file,
having a copy of it more easily accessible makes it easier to write
tools.

Bug: 6477365
Change-Id: I8cdb19536eca9a223c2b954e3f8ea0d9f3f86f02
 2012-05-11 09:22:29 -07:00
Doug Zongker
a0c3f51e39 am 2f11b071: am fffe1d5e: use the file uid/gid/mode saved in the target_files 
* commit '2f11b071b7687272450133bd58d8e3ceda271b1a':
  use the file uid/gid/mode saved in the target_files
 2012-05-04 16:40:29 -07:00
Doug Zongker
fffe1d5e9c use the file uid/gid/mode saved in the target_files 
When building a bootable image with mkbootfs, use the set of file
metadata that's stored in the target_files zip (when available),
rather than whatever is built into the mkbootfs binary at the time the
image is built.

Bug: 6435132
Change-Id: If6c59149bdbcc9a67e5ab9161398f355bd1f511d
 2012-05-03 16:15:29 -07:00
Joe Onorato
49eb72c94d am 8ad4bb16: Turn off adb on user builds. 
* commit '8ad4bb16a0d8b8ff9b4d17e860db336111bef34d':
  Turn off adb on user builds.
 2012-05-02 14:50:06 -07:00
Joe Onorato
8ad4bb16a0 Turn off adb on user builds. 
Tungsten is the first device we have done since post_process_props.py
and UsbDeviceManager were added that by default has no services running
on usb. Everything else has mtp.  This makes it so we always populate
the property with something.

Change-Id: Ic24f52462ed8866e87499c715dd21937e5b1128d
 2012-05-02 14:36:57 -07:00
Andrew Hsieh
f9613a4f73 Added BUILD_HOST_static to build statically linked executable/shared-lib 
Statically linked executable/shared-lib (eg. SDK tools) are useful
in sandboxed environment.

In BUILD_HOST_static zipalign needs -lpthread indirectly:
zipalign->libutils.a->liblog.a->logd_write.c->pthread

Change-Id: I8fa91a937b728ccdf942c4ba199efb1e2e49da3d
 2012-04-28 00:53:55 +08:00
Jean-Baptiste Queru
695a2b3fd9 am 9b16b129: Merge "Switch to new locations of toolchains" 
* commit '9b16b1293255be054a84e6f39098c7a35357f636':
  Switch to new locations of toolchains
 2012-04-23 09:23:58 -07:00
Keun young Park
e661e35829 Merge "Revert "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK"" 2012-04-20 16:20:42 -07:00
Keun young Park
b9566c0221 Revert "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK" 
This reverts commit 9283168e61
 2012-04-20 16:18:34 -07:00
Jean-Baptiste Queru
a50ef1c124 Switch to new locations of toolchains 
Change-Id: I15a8be11b3d0f1985ffd97dd51a1af18e1ce7b67
 2012-04-20 16:15:42 -07:00
Keun young Park
27f8946d2d Merge "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK" 2012-04-20 12:02:34 -07:00
Scott Main
e8e50739da am ac2c989e: am 6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section 
* commit 'ac2c989e8492a733bdd3d4c7e1bedd5210c56c8d':
  docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
 2012-04-20 10:38:51 -07:00
Scott Main
9041aa50fb am 6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section 
* commit '6b719da3162ef99db8b90379a9dc4724b571395f':
  docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
 2012-04-20 10:35:12 -07:00
Scott Main
ac2c989e84 am 6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section 
* commit '6b719da3162ef99db8b90379a9dc4724b571395f':
  docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
 2012-04-20 10:35:11 -07:00
Scott Main
6b719da316 docs: update sidenav-width-adjust script so Training classes save the width for the Resources section 
Change-Id: I0125b1d585a0adde7f5f485f3288fdc7a8a55faf
 2012-04-20 10:19:54 -07:00
Keun young Park
9283168e61 enable Java build for PDK build 
- Highest LOCAL_SDK_VERSION forced for package build / java library build
- uses prebuilt tools for PDK

Bug: 6352960
Change-Id: Ibb5162a16aa8151a1675baac14adb0cdfc13592d
 2012-04-20 10:07:31 -07:00
Scott Main
4793116d7a am 1882adfd: am 76b0139a: docs: update doc template to make the Resources side nav wider (+40px) 
* commit '1882adfd49b392acb6efe66a09bf753e1c830eef':
  docs: update doc template to make the Resources side nav wider (+40px)
 2012-04-19 19:30:33 -07:00
Scott Main
1882adfd49 am 76b0139a: docs: update doc template to make the Resources side nav wider (+40px) 
* commit '76b0139a50ecdfa5613af9563808cc42a72476d8':
  docs: update doc template to make the Resources side nav wider (+40px)
 2012-04-19 19:27:59 -07:00
Scott Main
27e5384054 am 76b0139a: docs: update doc template to make the Resources side nav wider (+40px) 
* commit '76b0139a50ecdfa5613af9563808cc42a72476d8':
  docs: update doc template to make the Resources side nav wider (+40px)
 2012-04-19 19:27:39 -07:00
Scott Main
76b0139a50 docs: update doc template to make the Resources side nav wider (+40px) 
Change-Id: I173e64d57f9ec31bf0c3912bca5d46a5f7c78338
 2012-04-19 19:23:04 -07:00
Kenny Root
f32dc71e49 resolved conflicts for merge of a86fcc29 to master 
Change-Id: I3868c19bfd309b5b43b5642152a120931fe37315
 2012-04-09 14:59:04 -07:00
Kenny Root
026e219f78 am b22f6853: Merge changes I5a63fd61,I7c6f59fe 
* commit 'b22f6853d9e6dd45491a20e31a63beda6c0f3717':
  Support the setting of file security contexts in OTA and update packages.
  Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.
 2012-04-06 18:06:09 -07:00
Stephen Smalley
56882bf9b4 Support the setting of file security contexts in OTA and update packages. 
Pass the file_contexts configuration to the releasetools scripts
so that the security contexts of files can be properly set for OTA
and update packages.

Requires Ica5fb73d6f2ffb981b74d1896538988dbc4d9b24

Change-Id: I5a63fd61a7e74d386d0803946d06bcf2fa8a857e
 2012-04-06 15:35:41 -04:00
Roman Nurik
4321c8177b am 5b250fbc: am dceeaac8: am 51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1 
* commit '5b250fbc433ff9143bf5717f636b0cbb8187bd35':
  docs: Android Design: v3 update (CSS changes)
 2012-04-04 11:00:33 -07:00
Roman Nurik
31fc69c218 am 51c9e67e: Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1 
* commit '51c9e67ec01d37bb67881ef06b7f38d4da36e945':
  docs: Android Design: v3 update (CSS changes)
 2012-04-04 10:55:47 -07:00
Roman Nurik
51c9e67ec0 Merge "docs: Android Design: v3 update (CSS changes)" into ics-mr1 2012-04-04 10:53:51 -07:00
Scott Main
0772cb651d am ad921800: am 0af1d53e: am 1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap. 
* commit 'ad92180046266eb0cbf0ea76b769e68caef5e778':
  docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
 2012-04-03 14:10:18 -07:00
Scott Main
ae9784cc50 am 1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap. 
* commit '1048bd3fb3c34de37375a6f1c8cd10f88411f758':
  docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
 2012-04-03 14:00:25 -07:00
Scott Main
1048bd3fb3 docs: revert the change that made "new" tags stick on the first line 
and thus allow them to wrap.

Change-Id: Id6b68e38a11f4fb314a0408c78bf7e2b543c8d00
 2012-04-03 13:26:25 -07:00
Daniel Berlin
ee406f1cbe Merge "Moving notice file generation to a python script (it was getting fairly complicated in bash), update HTML output to have a table of contents, and fix typos/bugs in notice file CSS" 2012-03-30 16:48:50 -07:00
Daniel Berlin
f5a97d7fbb Moving notice file generation to a python script 
(it was getting fairly complicated in bash),
update HTML output to have a table of contents,
and fix typos/bugs in notice file CSS

Change-Id: I51131f594e3bbe63f03165fa42f5ceeaec518543
 2012-03-30 15:08:59 -04:00
Jing Yu
f5172c7564 Switch default gcc toolchain from 4.4.3 to 4.6. 
Switch both arm-linux-androideabi toolchainand arm-eabi toolchain.

Change-Id: I7b2771fe684853ab37e3b5b7cfe4146f9f901e02
 2012-03-29 20:45:50 -07:00
Roman Nurik
5eed15e5cb docs: Android Design: v3 update (CSS changes) 
Change-Id: I00ffb845038f3054e03b41582859ecff4ab63a3e
 2012-03-29 13:28:37 -07:00
Scott Main
1f3f38c9b3 am 33666ade: docs: re-add android design icon, which had been removed from original location 
* commit '33666ade7a13f2c466346b05b2a7dd1f0f80cb43':
  docs: re-add android design icon, which had been removed from original location
 2012-03-29 12:09:44 -07:00
Brian Swetland
b8775421a5 don't build apicheck for PDK builds, removing dependency on doclava 
PDK builds have no Java APIs...

Change-Id: I719e0c206234d03a70f3178fd618676f8ee0e6f4
 2012-03-28 15:30:36 -07:00
Scott Main
b8faa7adcc am c07c8d05: am 0701c756: am 33666ade: docs: re-add android design icon, which had been removed from original location 
* commit 'c07c8d05910f3ceea4095d7d1ceb0fd7031aa021':
  docs: re-add android design icon, which had been removed from original location
 2012-03-27 10:10:35 -07:00
Scott Main
33666ade7a docs: re-add android design icon, which had been removed from original location 
Change-Id: I30f3a38ab3e80e78595e28c46815874e4a84f2ed
 2012-03-26 13:24:14 -07:00
Colin Cross
0bf80735ec build: move Zip* from libandroidfw to libutils 
ZipUtils is needed by build/tools, move it from libandroidfw
(frameworks/base) to libutils (frameworks/native).

Change-Id: I188247d058f1baa0ebd14282208d496c4ba061be
 2012-03-22 18:47:23 -07:00
Doug Zongker
8f3670bbc5 fix build: make check_radio_versions.py okay with no args 
Change-Id: I3539383d9761b57152c04ba9198c724509ba6223
 2012-03-21 10:01:01 -07:00
Doug Zongker
9296f09277 optional cross-check between OTA radio images and board-info.txt 
Adds a python script which checks the version of each radio image
added with the new add-radio-file-checked macro against a file
containing sha-1 -> version string mappings and the contents of
board-info.txt, so that the build can fail if board-info.txt and the
OTA images are out of sync.

Change-Id: Icb61dc2adefc240ced9059941582c23b629089c0
 2012-03-21 09:18:15 -07:00
Romain Guy
aaf01f48ee Make adbs work again on Darwin x86. 
We don't support building on Darwin PPC so let's always assume x86.

Change-Id: I079a4040f1c0a144d4cdd1e2b3d2a183c00bf7b0
 2012-03-13 16:57:08 -07:00
Roman Nurik
f84c92e861 am 52f25665: am a23a3d83: am d9ca90b4: Add SDK template and assets for Android Design 
* commit '52f256655855e0a03653a007cb4279eb1c152c5e':
  Add SDK template and assets for Android Design
 2012-03-07 17:05:15 -08:00
Dirk Dougherty
9c6abfb757 am 460eebe3: am 79736c72: am 7d114b19: doc change: assets for play 
* commit '460eebe3b7161cc3d74eba0ab6381dd4894bfffc':
  doc change: assets for play
 2012-03-07 16:48:23 -08:00
Roman Nurik
ba86e31428 am d9ca90b4: Add SDK template and assets for Android Design 
* commit 'd9ca90b4b9bd631329e6241b1ac4824ad0821639':
  Add SDK template and assets for Android Design
 2012-03-06 14:41:47 -08:00
Roman Nurik
d9ca90b4b9 Add SDK template and assets for Android Design 
Change-Id: Id7a953bf59e5e05242c46cdfb2b425e80424fc2f
 2012-03-06 14:31:15 -08:00
Dirk Dougherty
0dadb804dc am 7d114b19: doc change: assets for play 
* commit '7d114b195d2224ba8c6f8e156467b969317e0bf9':
  doc change: assets for play
 2012-03-05 21:39:25 -08:00
Dirk Dougherty
7d114b195d doc change: assets for play 
Change-Id: I58647fd0059c5de54dd7665527a73f61e0d2dd32
 2012-03-05 21:36:28 -08:00
Doug Zongker
1807e700a5 don't generate retouch commands in OTA scripts 
Doing ASLR at OTA time is now obsolete; we can stop emitting this code
in OTA scripts.

Change-Id: I2bcf8ef0697ea5590120f89dcd302f273daf531e
 2012-02-28 12:21:08 -08:00
Doug Zongker
3f37634545 Merge "releasetools: Fix image size checking" 2012-02-21 12:59:33 -08:00
Andrew Boie
0f9aec837f releasetools: Fix image size checking 
A block of code that should be evaluated for all
image types was instead only being run for yaffs
partitions.

Change-Id: I83ccbd7fa3c1bc02b9bba0832701ecc258e40a7d
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
 2012-02-21 12:45:23 -08:00
Mathias Agopian
9f763bec7b frameworks/base refactoring 
add libandroidfw.so to the build

Change-Id: If84e8afd5056a5ac66c3c9e116d821a8a5a571dd
 2012-02-20 22:38:41 -08:00
Mathias Agopian
6b0a355b37 frameworks/base refactoring: build fix 
Change-Id: If9f1b8a6a9eafa9ea17a3b994941c5c369be2130
 2012-02-17 19:41:13 -08:00
Scott Main
ba66dec545 am a57f538a: am 7f24ddbc: Merge "docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs" into ics-mr1 
* commit 'a57f538a22b99ae0e72e18e95d19635d2e6e0762':
  docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs
 2012-02-01 00:18:03 -08:00
Scott Main
bcb1457898 am 769a02fd: am 5be15a0f: Merge "docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue: 5931704" into ics-mr1 
* commit '769a02fd81fdf7e2a92c8282fa5eee05a4273b63':
  docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue: 5931704
 2012-02-01 00:15:54 -08:00
Scott Main
f43b085d1b am 7f24ddbc: Merge "docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs" into ics-mr1 
* commit '7f24ddbc75b301cd3520e8fefaeb2e94a6dcc80b':
  docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs
 2012-01-31 15:22:03 -08:00
Scott Main
7f24ddbc75 Merge "docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs" into ics-mr1 2012-01-31 15:19:44 -08:00
Scott Main
1c9630ea4a docs: add the sidenav h2 back to the stylesheet for compatibility w/ javadocs 
Change-Id: I37551efd09bea528200a93a8d3602ea11e63f140
 2012-01-31 15:18:47 -08:00
Scott Main
5ec64749fc am 5be15a0f: Merge "docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue: 5931704" into ics-mr1 
* commit '5be15a0f13ce559ca6339f0d2cf3dca9f3001dc1':
  docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue: 5931704
 2012-01-31 14:26:25 -08:00
Scott Main
5be15a0f13 Merge "docs: update TOS and PP links to point to unified policy/tems also add a link to the b.android.com issue for reporting doc issues and open footer links in a new window issue: 5931704" into ics-mr1 2012-01-31 14:24:54 -08:00
Scott Main
35e8c99869 docs: update TOS and PP links to point to unified policy/tems 
also add a link to the b.android.com issue for reporting doc issues
and open footer links in a new window
issue: 5931704

Change-Id: Icd6e9b7fb742b05a3c2064b6f2f7767b5b7ed1d8
 2012-01-31 11:20:24 -08:00
Scott Main
324b3a8bc5 am a20557fb: am 2032e319: docs: add schema.org sitenavigation scope for sid-navs 
* commit 'a20557fb4ddb3f008caf7bdb920c9ab90945ef7f':
  docs: add schema.org sitenavigation scope for sid-navs
 2012-01-30 17:24:54 -08:00
Scott Main
084c238c3b am 2032e319: docs: add schema.org sitenavigation scope for sid-navs 
* commit '2032e31979d0708120b4785bad6ee19ee1c4dc0c':
  docs: add schema.org sitenavigation scope for sid-navs
 2012-01-30 17:23:30 -08:00
Scott Main
2032e31979 docs: add schema.org sitenavigation scope for sid-navs 
Change-Id: I0952195223f93bda67af0b951c3a061fe92948ce
 2012-01-30 16:26:41 -08:00
Scott Main
068dcde2e7 am 3728f56b: am 939c3f72: docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets 
* commit '3728f56bc62f35d576b12180f5bbf33d0c83f00d':
  docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
 2012-01-30 16:17:13 -08:00
Scott Main
71415acc9f am 939c3f72: docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets 
* commit '939c3f72280fadbdc192b6bedd97555c2fcd4ef3':
  docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
 2012-01-30 16:14:51 -08:00
Scott Main
00bdc01845 am 1d5b7c54: am 3652a113: docs: add support for meta descriptions in the <head> 
* commit '1d5b7c5490d256bdaa516db4aaed584e9f0d1469':
  docs: add support for meta descriptions in the <head>
 2012-01-30 15:28:24 -08:00
Scott Main
939c3f7228 docs: modify css to support sidenav headings with span, instead of h2 
because I suspect the h2 is sending mixed signals to search engines for result snippets

Change-Id: I80f13774f25439efebcade1b9db41c005018d2aa
 2012-01-30 15:17:45 -08:00
Scott Main
bdd239edd5 am 3652a113: docs: add support for meta descriptions in the <head> 
* commit '3652a113d1a099ece283e3154188f4a42958c298':
  docs: add support for meta descriptions in the <head>
 2012-01-30 15:14:23 -08:00
Scott Main
3652a113d1 docs: add support for meta descriptions in the <head> 
Change-Id: I7ff7a5083a75dde718b4701623e029c225289617
 2012-01-30 13:03:37 -08:00
Scott Main
077868f8cd am c73e26f3: am dc7418b2: docs: add images for g+ homepage announcement 
* commit 'c73e26f3bd038b17e60e24d0ed4d6e125bc2ef00':
  docs: add images for g+ homepage announcement
 2012-01-30 10:06:28 -08:00
Scott Main
f9dd81dbb3 am dc7418b2: docs: add images for g+ homepage announcement 
* commit 'dc7418b282faf264c495e82a5bc3366e8348676c':
  docs: add images for g+ homepage announcement
 2012-01-30 10:04:07 -08:00
Scott Main
dc7418b282 docs: add images for g+ homepage announcement 
Change-Id: I36430a1885be368218e1c896d6fc008355096a06
 2012-01-30 09:53:13 -08:00
Doug Zongker
e5ff5907be add device-specific hooks at start of OTA phases 
Change-Id: I47534e6d40e7918ee8cb9e87d76d9030b9273708
 2012-01-17 10:55:37 -08:00
Glenn Kasten
1022e27642 Fix build warning 
Change-Id: I1e3a76e4bdae5eec4f75c5d8eb9f533afab6d140
 2012-01-12 07:30:27 -08:00
Jean-Baptiste Queru
cb8f66305c Revert "Point arm toolchain to the new gcc-4.6 one." 
This reverts commit 1f87795eef.
 2012-01-11 04:23:06 -08:00
Scott Main
dfd93fc209 am 5c267863: am f962eb10: Merge "docs: add css for Android Design links and add link to site header" into ics-mr1 
* commit '5c26786314c934819d460fb565be200ee8894ed0':
  docs: add css for Android Design links and add link to site header
 2012-01-10 17:18:50 -08:00
Scott Main
5af54ae9b7 am f962eb10: Merge "docs: add css for Android Design links and add link to site header" into ics-mr1 
* commit 'f962eb101b21814556f4edeb7128508d47cf5564':
  docs: add css for Android Design links and add link to site header
 2012-01-10 17:16:40 -08:00
Scott Main
b10b282b43 docs: add css for Android Design links and add link to site header 
Change-Id: I0a9469519076b1c5b9d7c121df1f2c731a08d2cb
 2012-01-10 09:59:22 -08:00
Steve Block
ca1df5a380 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ieea4e4511e1a95caeea42cd0a0c1147ebf9c2f48
 2012-01-08 11:03:18 +00:00
Jing Yu
1f87795eef Point arm toolchain to the new gcc-4.6 one. 
Tested build mysid-eng, sojus-eng, trygon-eng, yakju-eng.

Change-Id: I742cf9fcf2407b9098c99136d67161ecf062ac01

Conflicts:

	core/combo/TARGET_linux-arm.mk
 2012-01-06 14:14:06 -08:00
Steve Block
c0b74df335 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I817c12b1e97bee598097d02c70d509f7ab70576a
 2012-01-05 23:28:01 +00:00
Steve Block
934443b275 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: I02566a8d55d7f8845bcc11925b90b2dac4342e63
 2012-01-04 20:07:45 +00:00
Steve Block
15fab1aa8c Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I9281fd27af8c6ec29ebdca60b22f6c9d5ff8deed
 2012-01-03 22:37:53 +00:00
Scott Main
c5360c4035 am 96f696d9: am c4e8801c: am 50d6f97c: docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix 
* commit '96f696d90176b53c6902455b270960dd88ca1c1a':
  docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
 2011-12-15 20:12:50 -08:00
Scott Main
92c32ea079 am c4e8801c: am 50d6f97c: docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix 
* commit 'c4e8801c2d059aa68e59069c5cc03adb2d464e6b':
  docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
 2011-12-15 20:10:53 -08:00
Scott Main
c4e8801c2d am 50d6f97c: docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix 
* commit '50d6f97c46934014894a43d3610029f579145713':
  docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
 2011-12-15 20:09:04 -08:00
Scott Main
50d6f97c46 docs: revise space wrapping to avoid "new" tags from breaking new lines alone 
Temp fix

Change-Id: If99ce3442ec179a46fe3bbe0a06f690527d05eb5
 2011-12-15 20:06:32 -08:00
Scott Main
8543a9ef7e am a9255cfa: am 0af80fb4: am 0f429ebe: docs: fix bug in script for tab cookies 
* commit 'a9255cfa7c4b352b730ade2ea5cf3096f9512845':
  docs: fix bug in script for tab cookies
 2011-12-15 19:18:24 -08:00
Scott Main
02f547834a am 0af80fb4: am 0f429ebe: docs: fix bug in script for tab cookies 
* commit '0af80fb409708d86b360e842bc834b3cbe4bc443':
  docs: fix bug in script for tab cookies
 2011-12-15 19:16:20 -08:00
Scott Main
0af80fb409 am 0f429ebe: docs: fix bug in script for tab cookies 
* commit '0f429ebe63acbf8ccc1efe3c4185151eb15a4783':
  docs: fix bug in script for tab cookies
 2011-12-15 19:14:31 -08:00
Scott Main
0f429ebe63 docs: fix bug in script for tab cookies 
Change-Id: I09a49764f66673b3f55032158efd44c228832e8f
 2011-12-15 19:12:17 -08:00
Scott Main
412c8d25e0 am b90afc2c: am 9839afdd: am 1d42360a: docs: style and script changes for android u classes 
* commit 'b90afc2cf008fac3f63e721de7ef0a64f8e815b1':
  docs: style and script changes for android u classes
 2011-12-15 17:41:49 -08:00
Scott Main
9dd47277a3 am 9839afdd: am 1d42360a: docs: style and script changes for android u classes 
* commit '9839afddfcade4db1989718216b592aed76e73e7':
  docs: style and script changes for android u classes
 2011-12-15 17:39:50 -08:00
Scott Main
9839afddfc am 1d42360a: docs: style and script changes for android u classes 
* commit '1d42360a028b2d55f6d4d29bd99e8ef3de6e8402':
  docs: style and script changes for android u classes
 2011-12-15 17:37:35 -08:00
Scott Main
1d42360a02 docs: style and script changes for android u classes 
Change-Id: I5866541bb9dd41329aa02328b805959c8f675f8c
 2011-12-15 17:34:40 -08:00
Sean Dykeman
6da9ef6996 Make java-event-log-tags.py create its output directory if it does not exist. 
Change-Id: I88ca3e6e70d1ff9db8f1328f18c36abc196e1aad
 2011-12-13 10:56:33 -08:00
Doug Zongker
dfe9fa5090 am bd2dadc2: check entire recovery partition on startup 
* commit 'bd2dadc21a5db967972a7b8f81aad716609edacb':
  check entire recovery partition on startup
 2011-12-02 13:58:17 -08:00
Doug Zongker
bd2dadc21a check entire recovery partition on startup 
Checksum the entire recovery partition at boot time to see if we need
to rewrite it, rather than just the first 2kb.

Bug: 5668350
Change-Id: I777754f92e8da630ae3c09bb0d4c41884ff62f39
 2011-12-02 13:55:57 -08:00
Doug Zongker
0276d18873 check entire recovery partition on startup 
Checksum the entire recovery partition at boot time to see if we need
to rewrite it, rather than just the first 2kb.

Bug: 5668350
Change-Id: I777754f92e8da630ae3c09bb0d4c41884ff62f39
 2011-12-02 10:46:59 -08:00
Scott Main
28d831ee52 am d34204b9: am b83d8f15: am f5cbe002: Merge "docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add 
* commit 'd34204b9ec3e79862f5101837ccc6f90909b9850':
  docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button.
 2011-12-01 20:44:25 -08:00
Scott Main
148588b4de am b83d8f15: am f5cbe002: Merge "docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/ 
* commit 'b83d8f15ccc276b190a6c02002f6af94aa2e9cb4':
  docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button.
 2011-12-01 20:43:02 -08:00
Scott Main
adc61d6a0e docs: update template and css for android u 
Add a custom version of docpage.cs to the droiddoc template, because
it adds a good deal of custom design and behavior (instead of updating
the doclava version of the file). Add CSS for next/previous links in
android u lessons and revise style for download button.

Change-Id: I829c4fb134d6f5c3cee82fb86958d23ef64e8481
 2011-11-30 18:55:01 -08:00
Doug Zongker
402839d17a am 29ea81eb: am 4a84a13e: am a5f534df: use frozensets to represent APK cert sets 
* commit '29ea81eb977699a2b026f08d13f213a7d216cb7e':
  use frozensets to represent APK cert sets
 2011-11-11 20:36:58 -08:00
Doug Zongker
1a16f33779 am 4a84a13e: am a5f534df: use frozensets to represent APK cert sets 
* commit '4a84a13e7ce65f24bcadb8d331023b6415d7867e':
  use frozensets to represent APK cert sets
 2011-11-11 20:34:28 -08:00
Doug Zongker
a5f534df07 use frozensets to represent APK cert sets 
Change-Id: Ic92c83be0c3f6a76bf1bd21f0216cd1b87586959
 2011-11-11 09:51:37 -08:00
Ying Wang
9f8e8db188 Build cache.img on demand 
Bug: 5153694
To build cache.img, set BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE (required,
ext4 only for now), BOARD_CACHEIMAGE_PARTITION_SIZE (optional) in
BoardConfig.mk.

Change-Id: I1d8b91646aa1dba88285e008ad3335768bcbddd2
 2011-11-10 14:30:34 -08:00
Doug Zongker
4906f456a4 am 53bef54c: am 4b87f575: am 278c9781: to be upgraded, APKs must have exactly the same set of certs 
* commit '53bef54cfff0cb9c6a67494b3e385a9617f75d03':
  to be upgraded, APKs must have exactly the same set of certs
 2011-11-10 16:14:42 +00:00
Doug Zongker
afe395dab6 am 4b87f575: am 278c9781: to be upgraded, APKs must have exactly the same set of certs 
* commit '4b87f575d45320260e35f224cd18f36eec5e3eb2':
  to be upgraded, APKs must have exactly the same set of certs
 2011-11-09 19:05:30 +00:00
Doug Zongker
278c9781ec to be upgraded, APKs must have exactly the same set of certs 
Change-Id: I0d528d3d55e5ee553e57e63ed1f998172c6306f8
 2011-11-09 10:32:23 -08:00
Ying Wang
c0debb9b5e Revert "Build cache.img." 
This reverts commit 531bdb546a.
 2011-11-02 11:19:28 -07:00
Ying Wang
531bdb546a Build cache.img. 
Change-Id: I3dbe7afa4934fa718ba20605eebd2e3ce2ae82ab
 2011-11-01 10:44:19 -07:00
Ying Wang
bd93d425ae Unify the user image building code 
Bug: 5398808

Before this change we have duplicate code in the Makefile and the
python-based releasetool. That's a real headache to maintain.

Change-Id: I8ddf04a79c6886540e89d990f723d8f77c9dd883
 2011-10-31 17:11:35 -07:00
Joe Onorato
c72b1403e4 Add a tool to let you enforce layering between packages in a java module. 
And build system support for it too.

Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
 2011-10-30 21:37:35 -07:00
Jeff Davidson
50e384c01b am 7857373b: am 033fbe28: Support signing target_files without a recovery.fstab. 
* commit '7857373b7ee6d837b3df084d682ca8de4e3dc212':
  Support signing target_files without a recovery.fstab.
 2011-10-27 02:56:37 +00:00
Jeff Davidson
033fbe28c2 Support signing target_files without a recovery.fstab. 
Change-Id: I7d6f511c69d589bf035ac3eb7eeee4b0e0505faa
 2011-10-26 18:16:13 -07:00
Scott Main
530805858f am 5e528222: am 8bb6ea59: Merge "docs: add new style for adding "deprecated" messages to dev guides" into ics-mr0 
* commit '5e5282227f9bc0342f78b7d1e201842da70374a3':
  docs: add new style for adding "deprecated" messages to dev guides
 2011-10-26 20:21:23 +00:00
Steve Block
2da72c6265 Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: Ie7704789e47b9553d02e3f6ed89c3ceab532119c
 2011-10-25 18:14:48 +01:00
Scott Main
360240097a docs: add new style for adding "deprecated" messages to dev guides 
Change-Id: I0d690a6c0880343919114370331b7c2756b6a50e
 2011-10-24 16:45:58 -07:00
Scott Main
51372cd2e5 docs: update "na" style to make opaque, add dropshadow, and re-order 
z-index to be on top of images

Change-Id: I7c0c2e15d511f4362eb721bf8eb0343fa3f24bc0
 2011-10-19 16:09:26 -07:00
Scott Main
23f66d0927 Merge "docs: add ics logo for homepage" 2011-10-05 13:58:25 -07:00
Scott Main
76b6e18184 docs: add ics logo for homepage 
Change-Id: I57504ce0919c88fd28ef550775b012b6c3d8498f
 2011-10-05 13:53:36 -07:00
Doug Zongker
f41e67d82f am ad4142cc: Merge "add missing parameter to ReplaceOtaKeys" into ics-factoryrom 
* commit 'ad4142cce8e8a4fe8c9cbfe92a49428ea789986e':
  add missing parameter to ReplaceOtaKeys
 2011-10-05 11:32:16 -07:00
Doug Zongker
b11e2d78ec add missing parameter to ReplaceOtaKeys 
Change-Id: Ib596235a8e3b3588d363fea82b92b69895ee5408
 2011-10-05 11:23:06 -07:00
Doug Zongker
831840e51b change OTA tools to handle variable dev keys 
The signing and OTA-building tools now understand the
default_sys_dev_certificate value which may be present in the
META/misc_info.txt file of the target-files packages.

Change-Id: I64f09ec0b77a5184b6ddb74019255518776ee773
 2011-10-04 16:02:01 -07:00
Scott Main
8e83353d47 docs: fix visual bug in the search tabs. 
I assume this was introduced by a change in the CSE implementation

Change-Id: I776e385fd6c0d738a4bbf8372911b205c1f98123
 2011-10-03 15:34:32 -07:00
Scott Main
bc54702626 docs: add 'reference' class for use with 'special' to refine the headings 
used within the 'special' div when in the reference.

Change-Id: Iebf84484e2eda104b2247aefc5a539f2a62c5102
 2011-10-03 13:01:43 -07:00
Doug Zongker
c825d3e352 am 6e69feed: Merge "allow APKs to be signed with multiple certs" into ics-factoryrom 
* commit '6e69feed1a3d57d3206f7dabe32e06e8b07189e2':
  allow APKs to be signed with multiple certs
 2011-09-29 14:09:38 -07:00
Doug Zongker
b40a58e4b3 allow APKs to be signed with multiple certs 
The Package Manager handles this now.  To share a UID, all packages
must be signed with exactly the same set of certs.

Change-Id: I2fd08923f55f02ae2f1d503266ab124be2472921
 2011-09-29 13:22:57 -07:00
Doug Zongker
91b4f8a850 fix syntax error in OTA script 
Change-Id: I3a9535acb47fc3960020a390dec8d0294a404c2e
 2011-09-23 12:48:33 -07:00
Doug Zongker
afb32eaca0 change OTA tools to handle variable dev keys 
The signing and OTA-building tools now understand the
default_sys_dev_certificate value which may be present in the
META/misc_info.txt file of the target-files packages.

Change-Id: I64f09ec0b77a5184b6ddb74019255518776ee773
 2011-09-22 10:28:04 -07:00
Scott Main
99113abd2a docs: enable 'updated' tag for resource docs 
Change-Id: I070f14247088f6a88dcfdfb352615e588bf3e902
 2011-09-21 20:52:47 -07:00
Scott Main
219a267408 docs: fix javadoc filtering script to not choke on R.styleable class but continue handling provisional api levels 
Change-Id: Ia21ea5d4f379fd85d975d1f3fe387c311c7c15aa
 2011-09-21 18:38:44 -07:00
Raphael
131292c042 Add rm and strip abilities to atree. DO NOT MERGE. 
The new line syntax is:
  [SRC] [rm|strip] DEST

This allows one to write things like this in atree:

  bin/src
  bin/src bin/dest
  bin/src "bin/another file name"

  rm dest/file
  rm dest/dir  # recursive

  strip bin/src
  bin/src strip bin/dest

Src and dest can contain spaces if full enclosed in double-quotes.
The strip command can be overridden using the STRIP env var.

Cherry-pick from master 0b3ec5d32f
 2011-09-16 21:25:18 -07:00
Raphael
0b3ec5d32f Add rm and strip abilities to atree. 
The new line syntax is:
  [SRC] [rm|strip] DEST

This allows one to write things like this in atree:

  bin/src
  bin/src bin/dest
  bin/src "bin/another file name"

  rm dest/file
  rm dest/dir  # recursive

  strip bin/src
  bin/src strip bin/dest

Src and dest can contain spaces if full enclosed in double-quotes.
The strip command can be overridden using the STRIP env var.

Change-Id: I22aae7a87c36c082e1aab87132099a3c644914da
 2011-09-15 11:22:16 -07:00
Scott Main
2b2f3b9400 Merge "cherrypick from Change-Id: I2722879ee7f246e34acca7fd9fb84acff4e8540d docs: some css for android u and javascript" 2011-09-13 09:45:57 -07:00
Scott Main
629b0f00d3 cherrypick from Change-Id: I2722879ee7f246e34acca7fd9fb84acff4e8540d 
docs: some css for android u
and javascript

Change-Id: Idb897999eb9c88823ebab418ca5386bca77ca969
 2011-09-13 09:43:16 -07:00
Ying Wang
e5e8c5f218 Move forward installed-files.txt in the dependency graph 
Bug: 5265104
- Move installed-files.txt forward to ahead of system.img in the
dependency graph, so that even if the system.img fails to build due to
too large size we can still get the size stats.
- Change the script tools/fileslist.py to sort items in decreasing size.

Change-Id: I5913bc51971e341ffbfcf3fa449c987f126e409b
 2011-09-09 17:07:23 -07:00
Doug Zongker
e92f15a858 patch the /system/build.prop file last 
Works around a problem observed on a retail device: incremental update
from build 1 to build 2 partially completed, leaving a mix of files
from the two builds.  (Why it booted into the regular system instead
of recovery to restart update installation is still a mystery.)
build.prop was one of the files updated, so the device reported itself
as having build 2.  The device hobbled along for months in this state,
until build 3 was released and the 2-to-3 incremental package
repeatedly failed (because some of the files it was trying to patch
were build 1).

This change makes updating build.prop the very last thing does by an
incremental update script, so if installation is aborted and the
regular system starts (and works at all), it will continue reporting
itself as build 1 and be sent the 1-to-2 OTA package again.

Change-Id: I1edc1dcef2bd2495b6fd96517c2f4c574b994f27
 2011-08-26 13:46:40 -07:00
Ying Wang
c7fd4a5a7b am 2bcdfe14: am 4651ee5d: am 7c7a8f02: Merge "Sort the results of findleaves again." 
* commit '2bcdfe145d485fc28e86700e4ed57ac67368de25':
  Sort the results of findleaves again.
 2011-08-19 09:36:56 -07:00
Ying Wang
2bcdfe145d am 4651ee5d: am 7c7a8f02: Merge "Sort the results of findleaves again." 
* commit '4651ee5db200772921bad828c280d165ff3997c3':
  Sort the results of findleaves again.
 2011-08-19 09:35:50 -07:00
Ishida, Haruyasu
58e52b434b Sort the results of findleaves again. 
Commit d36e945 changed findleaves.py to sort the output files so that
the order is deterministic and won't cause spurious build errors when
files happen to be listed (and hence read) in different order on
e.g. add/remove the makefiles.

This correction broke after commit 4820a94 because the conversion to
a set with set() in order to remove duplicates came after sort() and
potentially altered the order of the elements.

This commit fixes makes sure findleaves.py is guaranteed to return
a sorted filename list without duplicates.

Change-Id: Ifd96d04d45641fe43d4cc4739f78a2d4d25cc212
 2011-08-19 08:14:53 +02:00
Ying Wang
bed0a19583 am 6d38bdfc: resolved conflicts for merge of a74a4811 to honeycomb-plus-aosp 
* commit '6d38bdfc7b9ff699370b4a40dcbdddce0ea713b8':
  sha module is deprecated
 2011-08-11 16:59:48 -07:00