Commit graph

1466 commits

Author SHA1 Message Date
Scott Main
4810a2440c am 71e20e2e: am ef4d1081: Merge "update class header for deprecated info" into jb-dev-docs
* commit '71e20e2e562957681fdd3965dfc308edcbafa31f':
  update class header for deprecated info
2012-10-24 19:35:37 -07:00
Scott Main
ef4d10811a Merge "update class header for deprecated info" into jb-dev-docs 2012-10-24 19:31:25 -07:00
Scott Main
27ac66542a update class header for deprecated info
Change-Id: I4c41f0bdbac43dc49c99af7bcb5521f7e3278304
2012-10-24 18:50:46 -07:00
Dirk Dougherty
9473c1e30f am dab9a7a1: am 37fdea96: am db9ad2da: am 80ebbc3c: am 1a13c317: am a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit 'dab9a7a1029242a6d7a8250f9e9bd22ce95b84f5':
  Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
2012-10-24 13:47:17 -07:00
Dirk Dougherty
37fdea969f am db9ad2da: am 80ebbc3c: am 1a13c317: am a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit 'db9ad2da9efbd5aa614f72a820edf6c1b1cfaf4b':
  Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
2012-10-24 13:42:41 -07:00
Dirk Dougherty
db9ad2da9e am 80ebbc3c: am 1a13c317: am a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit '80ebbc3c5fde6d653c92a0288e1967f519b9c9ef':
  Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
2012-10-24 13:39:55 -07:00
Dirk Dougherty
80ebbc3c5f am 1a13c317: am a4375a19: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
* commit '1a13c317627996234a1dfa2c0736733bd1c4c696':
  Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
2012-10-24 13:38:19 -07:00
Dirk Dougherty
a4375a19c6 Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs 2012-10-24 13:33:40 -07:00
Scott Main
c7eda3e964 am de42d4b0: am f98bd743: am bd027cd4: am ab84504b: am 6613a232: am 0e585706: fix spacing in carousel text for Develop homepage
* commit 'de42d4b0bfc79760eb05eb29dd44d159903530ac':
  fix spacing in carousel text for Develop homepage
2012-10-22 20:43:36 -07:00
Scott Main
f98bd74319 am bd027cd4: am ab84504b: am 6613a232: am 0e585706: fix spacing in carousel text for Develop homepage
* commit 'bd027cd4e79b281dc414e170ada4f92bd580dbf0':
  fix spacing in carousel text for Develop homepage
2012-10-22 20:40:31 -07:00
Scott Main
bd027cd4e7 am ab84504b: am 6613a232: am 0e585706: fix spacing in carousel text for Develop homepage
* commit 'ab84504b8a9e24b15af916faa95dcf65685a22a3':
  fix spacing in carousel text for Develop homepage
2012-10-22 20:37:56 -07:00
Scott Main
ab84504b8a am 6613a232: am 0e585706: fix spacing in carousel text for Develop homepage
* commit '6613a2327512f3742d55cf0eb79fc4d52cf9a7cb':
  fix spacing in carousel text for Develop homepage
2012-10-22 20:35:42 -07:00
Scott Main
0e585706f0 fix spacing in carousel text for Develop homepage
Change-Id: If8f95e66b4c1b4918b0d1dea59241d5a17acbfd9
2012-10-22 20:30:22 -07:00
Joe Onorato
8858d2a731 Add a tool to let you enforce layering between packages in a java module.
And build system support for it too.

Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
2012-10-20 17:25:55 -07:00
Joe Onorato
0eccce99d7 Add a tool to let you enforce layering between packages in a java module.
And build system support for it too.

Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
2012-10-18 10:21:46 -07:00
Doug Zongker
b5f1d8bdc3 add multiple key support to signapk
Support signing .apks (but not OTA packages) with multiple keys.

Bug: 7350459
Change-Id: I794e1da0555e2bb9247a59c756656d4ca7ee04cf
2012-10-16 09:44:09 -07:00
Dirk Dougherty
2297ace604 Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
Change-Id: I5a14bae715187c3d9307b39394f1b53d4fed39dd
2012-10-13 17:32:23 -07:00
Dirk Dougherty
2103600410 am 9f81546a: am fc8cec68: am afc782da: am 77b10b6a: am e37b7a52: am 8f20607c: Doc change: add new items to qv and adjust height.
* commit '9f81546a25b9228a0ccd55d16478d9a0beed5a85':
  Doc change: add new items to qv and adjust height.
2012-10-11 17:54:25 -07:00
Dirk Dougherty
afc782da46 am 77b10b6a: am e37b7a52: am 8f20607c: Doc change: add new items to qv and adjust height.
* commit '77b10b6a78f8ef77e2d5bbb3cb650f953c642527':
  Doc change: add new items to qv and adjust height.
2012-10-11 16:57:43 -07:00
Dirk Dougherty
77b10b6a78 am e37b7a52: am 8f20607c: Doc change: add new items to qv and adjust height.
* commit 'e37b7a52abb488f853fefa1a13eec1b5c20844a6':
  Doc change: add new items to qv and adjust height.
2012-10-11 15:33:05 -07:00
Dirk Dougherty
8f20607ccb Doc change: add new items to qv and adjust height.
Change-Id: I246c36e0aabb32264325e0943aed127419da2a73
2012-10-11 15:29:33 -07:00
Robert Ly
0a0e4a6990 update pdk build templates
Change-Id: Ibda42779827a337ed0bc1c5797ce2b5b50d4686a
2012-10-09 12:11:08 -07:00
Robert Ly
c22207f8a5 fix pdk docs build
Change-Id: I8c6e769d08247ce93823e4c59a55cd90b9c08e38
2012-10-09 10:33:27 -07:00
Scott Main
1a7b450c82 am 505fae2a: am 3dd2756e: am d73053a8: am b282c359: am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages
* commit '505fae2ae4a1bf649cc488d4832ef5d43b127ccb':
  fix layout bug on API Guide landing pages
2012-10-08 16:23:05 -07:00
Scott Main
d73053a814 am b282c359: am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages
* commit 'b282c359fcbde7f36b579cde388ca044a0dd6d60':
  fix layout bug on API Guide landing pages
2012-10-08 16:06:43 -07:00
Scott Main
b282c359fc am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages
* commit '126c5e9205263f097af4d0f9dca3b10c9a02d72b':
  fix layout bug on API Guide landing pages
2012-10-08 16:04:25 -07:00
Scott Main
e6850d2db7 fix layout bug on API Guide landing pages
Change-Id: Ic757d26c29cd06c33dc62816698b68a9b5fe869a
2012-10-08 15:59:01 -07:00
Scott Main
180f901b6c am 919a2f88: am 0d24628c: am be1df522: am ded6dc01: am 86028756: am 46c5804c: add analytics tracking event for sdk/ndk downloads
* commit '919a2f88efbbce3a83bd497b52aa1b35f1d5e5da':
  add analytics tracking event for sdk/ndk downloads
2012-10-03 17:47:24 -07:00
Scott Main
be1df522a9 am ded6dc01: am 86028756: am 46c5804c: add analytics tracking event for sdk/ndk downloads
* commit 'ded6dc0137fb0632f9de47870fb923567ea22b17':
  add analytics tracking event for sdk/ndk downloads
2012-10-03 17:41:59 -07:00
Scott Main
ded6dc0137 am 86028756: am 46c5804c: add analytics tracking event for sdk/ndk downloads
* commit '860287560db20e6f46a282284d8a04d5e001d2ea':
  add analytics tracking event for sdk/ndk downloads
2012-10-03 17:40:45 -07:00
Scott Main
46c5804c47 add analytics tracking event for sdk/ndk downloads
Change-Id: Icb04694ef9498ae684350ad4a971fb23d0301605
2012-10-03 16:34:52 -07:00
Scott Main
75277754d2 am 71507e9b: am cd67e0e1: am 8cb3263d: am 55b19bdd: am 9341d398: am a4888dc8: adjust position of prev/next links at bottom of page to account for russian string length
* commit '71507e9b627f1607e3b9218439212c3571cff989':
  adjust position of prev/next links at bottom of page to account for russian string length
2012-10-02 23:38:22 -07:00
Scott Main
8cb3263dd0 am 55b19bdd: am 9341d398: am a4888dc8: adjust position of prev/next links at bottom of page to account for russian string length
* commit '55b19bddcc6dfe750a1df70fe9955a42701f0007':
  adjust position of prev/next links at bottom of page to account for russian string length
2012-10-02 23:32:42 -07:00
Scott Main
55b19bddcc am 9341d398: am a4888dc8: adjust position of prev/next links at bottom of page to account for russian string length
* commit '9341d398a87fd9679366fafbbc398601c4c01de4':
  adjust position of prev/next links at bottom of page to account for russian string length
2012-10-02 23:31:34 -07:00
Scott Main
a4888dc865 adjust position of prev/next links at bottom of page to account for russian string length
Change-Id: I450a11e49fb16bb9e30140d78b190d06b39e1b13
2012-10-02 23:28:08 -07:00
Scott Main
f3d0104a80 DO NOT MERGE
cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

provide more width for buttons in training top nav to accomodate longer
strings from translation

Change-Id: Ia1d8f7caa532ad1060d8a54fda082ada754c1f48
2012-10-02 21:02:22 -07:00
Scott Main
6eb95f1ac8 DO NOT MERGE
cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

refactor the logic for changing languages in global strings.
instead of using separate <span> elements for each language,
provide a unique attribute in each <a> element for each localized
version of that link's title.

Change-Id: I09c65a8dce9b3d9623e32fe17876b055e452618b
2012-10-02 21:00:53 -07:00
Scott Main
aa2ce5d9aa DO NOT MERGE
cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455
add localize langs for global strings

Change-Id: I02b6c5b5d83247a352dc041e9885befe82502adc
2012-10-02 20:58:34 -07:00
Scott Main
24bbcd5026 DO NOT MERGE
cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170
add style for code captions;
ignore sidenav headers for HRs

Change-Id: Ic7768dc388a3871be8b02634e2b70f360a62e407
2012-10-02 20:56:56 -07:00
Scott Main
52948fcf8c DO NOT MERGE
cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626
create consistent spacing between lists and the paragraphs within them

Change-Id: I4977e4f6f34c7fb8605c861ebb4b33895f630977
2012-10-02 20:53:11 -07:00
Scott Main
295032846a am 858ea183: am a67b7aa5: am b61c601b: am 2452b062: am 0c81a130: provide more width for buttons in training top nav to accomodate longer strings from translation
* commit '858ea18338b9d756f24ba976cf5de18c6527c933':
  provide more width for buttons in training top nav to accomodate longer strings from translation
2012-10-02 20:47:32 -07:00
Scott Main
b61c601b57 am 2452b062: am 0c81a130: provide more width for buttons in training top nav to accomodate longer strings from translation
* commit '2452b0625c18bb11a37eb9216078a83f41971240':
  provide more width for buttons in training top nav to accomodate longer strings from translation
2012-10-02 20:42:29 -07:00
Scott Main
2452b0625c am 0c81a130: provide more width for buttons in training top nav to accomodate longer strings from translation
* commit '0c81a130ef01981a0cbc3564c26658c51951812d':
  provide more width for buttons in training top nav to accomodate longer strings from translation
2012-10-02 20:40:14 -07:00
Scott Main
80814582e4 am 8d50101b: am bb179ed6: am cbefa644: am b649b416: am 235f4d4f: refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that
* commit '8d50101b3e7f643771f2410a8fc178c53d771430':
  refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title.
2012-10-02 20:37:41 -07:00
Scott Main
0c81a130ef provide more width for buttons in training top nav to accomodate longer
strings from translation

Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
2012-10-02 20:36:45 -07:00
Scott Main
cbefa6445e am b649b416: am 235f4d4f: refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link\'s title.
* commit 'b649b41604822cc0c9c32b3bc98233a8ab1148c9':
  refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title.
2012-10-02 20:32:11 -07:00
Scott Main
b649b41604 am 235f4d4f: refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link\'s title.
* commit '235f4d4f8580a56d553e19c1beab1f8c22132e84':
  refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title.
2012-10-02 20:29:45 -07:00
Scott Main
235f4d4f85 refactor the logic for changing languages in global strings.
instead of using separate <span> elements for each language,
provide a unique attribute in each <a> element for each localized
version of that link's title.

Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
2012-10-02 17:44:42 -07:00
Scott Main
04874a5486 am 4a19942e: am ca1ee0fd: am 817c0882: am 74811834: am dd3d3eea: add localize langs for global strings
* commit '4a19942ef99ec05f82a21a80ca0ca0094f646f78':
  add localize langs for global strings
2012-10-02 14:54:33 -07:00
Scott Main
817c088203 am 74811834: am dd3d3eea: add localize langs for global strings
* commit '748118343d76ed8b48c7b9ff48cbed8e2ab44ebb':
  add localize langs for global strings
2012-10-02 14:49:07 -07:00
Scott Main
748118343d am dd3d3eea: add localize langs for global strings
* commit 'dd3d3eea1d953e4a174edb6e75cfdf0fcf03060f':
  add localize langs for global strings
2012-10-02 14:47:52 -07:00
Scott Main
dd3d3eea1d add localize langs for global strings
Change-Id: I90412e1e03a2676d927796187fe811481bf38455
2012-10-02 14:44:54 -07:00
Scott Main
01b73267b4 am 9b423a82: am 57a0a4c1: am dcce7ca6: am 582db97b: add style for code captions; ignore sidenav headers for HRs
* commit '9b423a82d823f3516fcd969ac2cbc6c04e04e281':
  add style for code captions; ignore sidenav headers for HRs
2012-09-24 00:49:45 -07:00
Scott Main
57a0a4c1fe am dcce7ca6: am 582db97b: add style for code captions; ignore sidenav headers for HRs
* commit 'dcce7ca6a82cf08a7047d0fd23ba05b47be831c1':
  add style for code captions; ignore sidenav headers for HRs
2012-09-21 14:56:35 -07:00
Scott Main
dcce7ca6a8 am 582db97b: add style for code captions; ignore sidenav headers for HRs
* commit '582db97b23982f8e9cac7926ac3f5806b6a9cc71':
  add style for code captions; ignore sidenav headers for HRs
2012-09-21 14:54:09 -07:00
Scott Main
582db97b23 add style for code captions;
ignore sidenav headers for HRs

Change-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170
2012-09-21 14:33:43 -07:00
Keun young Park
b7eb93d4b9 am 62526137: am fe1d3b12: Merge "fix PDK build" into jb-mr1-dev
* commit '62526137891e38aceb8562459a85eef1a73c3856':
  fix PDK build
2012-09-20 15:46:14 -07:00
Keun young Park
6530b38d7c fix PDK build
- build tools not coming from prebuilts for PDK

Change-Id: I5760a54f502b8aa2167976c8f1e17412f31c6f5f
2012-09-20 14:31:17 -07:00
Doug Zongker
b8a35577d7 am 85c118b1: am c4d68391: Merge "fix merge-event-log-tags.py deprecation warning" into jb-mr1-dev
* commit '85c118b1323a954786cb36f47fbfab9515a7950a':
  fix merge-event-log-tags.py deprecation warning
2012-09-20 12:52:51 -07:00
Ying Wang
b1337dce87 am 47424a68: am 295cf570: Use prebuilt for PDK builds.
* commit '47424a686f0ccb7413d54ebae7288f2e4e02b64e':
  Use prebuilt for PDK builds.
2012-09-20 12:52:50 -07:00
Doug Zongker
c4d68391cc Merge "fix merge-event-log-tags.py deprecation warning" into jb-mr1-dev 2012-09-20 12:02:24 -07:00
Doug Zongker
6ce87a1fc8 fix merge-event-log-tags.py deprecation warning
Prefer using the hashlib module if it's available, instead of the
deprecated md5 module.

Change-Id: Id5e50af125ae47f34d011d8612059424472c7c3f
2012-09-20 11:50:34 -07:00
Ying Wang
295cf570d6 Use prebuilt for PDK builds.
Change-Id: Ief723fe137b7a3aa051837e3ca1079fea772357d
2012-09-20 10:37:39 -07:00
Ying Wang
6ea43e3cf8 am 61ff681b: am 4da2f9ca: Use prebuilt signapk.jar for unbundled branch.
* commit '61ff681bb2791479ff54de33732e4351db5328d4':
  Use prebuilt signapk.jar for unbundled branch.
2012-09-20 06:19:00 -07:00
Doug Zongker
3b53120004 am b4a914ed: am 147626e6: change SignApk.java to use bouncy castle for signing
* commit 'b4a914ed19c37680d914dc4c214f92752eaa06dd':
  change SignApk.java to use bouncy castle for signing
2012-09-20 06:18:58 -07:00
Ying Wang
4da2f9caaa Use prebuilt signapk.jar for unbundled branch.
Change-Id: I762b23931042f7ffde829aaf928f54df46a49d78
2012-09-19 17:51:21 -07:00
Doug Zongker
147626e624 change SignApk.java to use bouncy castle for signing
Remove use of the private sun.security.* classes for generating pkcs7
signatures and use bouncy castle instead.

Change-Id: Ie8213575461975085d119e000e764d2a28c26715
2012-09-18 23:29:10 -07:00
Scott Main
a7f07b5112 am 496d88cd: am 8cf60ec1: am 5acbfcf6: am 7039b4a7: create consistent spacing between lists and the paragraphs within them
* commit '496d88cdc099153bbeadcfec7d6c8fbe6944fa31':
  create consistent spacing between lists and the paragraphs within them
2012-09-18 17:16:14 -07:00
Scott Main
8cf60ec166 am 5acbfcf6: am 7039b4a7: create consistent spacing between lists and the paragraphs within them
* commit '5acbfcf66aa60908213522a6b69b41f4b69f6f8e':
  create consistent spacing between lists and the paragraphs within them
2012-09-18 15:54:12 -07:00
Scott Main
5acbfcf66a am 7039b4a7: create consistent spacing between lists and the paragraphs within them
* commit '7039b4a7bca269a898aacad9ddde693598ccecfc':
  create consistent spacing between lists and the paragraphs within them
2012-09-18 15:40:02 -07:00
Scott Main
7039b4a7bc create consistent spacing between lists and the paragraphs within them
Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626
2012-09-18 11:27:59 -07:00
Scott Main
79e7cc286a am 83fe2784: am 7d89e1ce: am 7832dda0: am 5b5ff1a6: more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
* commit '83fe27845c8c062600bb7257bce53c73461ce1bc':
  more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
2012-09-12 17:02:27 -07:00
Scott Main
930957f84f am e276c244: am b050ed29: am 5f4e1ac6: am ee7cb463: Merge "add \'small\' style for long headings in Training courses" into jb-dev
* commit 'e276c2444bbbe185042bf65c4de82e0137681fdf':
  add 'small' style for long headings in Training courses
2012-09-12 15:28:41 -07:00
Scott Main
7d89e1ce07 am 7832dda0: am 5b5ff1a6: more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
* commit '7832dda030013a10cf2c161d37025bed5433326e':
  more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
2012-09-12 10:36:15 -07:00
Scott Main
7832dda030 am 5b5ff1a6: more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
* commit '5b5ff1a6aeb0d12ecdf817d6ec3e585fd2c892e3':
  more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
2012-09-12 10:34:15 -07:00
Scott Main
5b5ff1a6ae more specific selector for new blockquote style to fix regressions
on other pages that use <blockquote>

Change-Id: Icf37f515cfe2204afb58a796222c166088d0f131
2012-09-12 10:29:45 -07:00
Scott Main
b050ed294a am 5f4e1ac6: am ee7cb463: Merge "add \'small\' style for long headings in Training courses" into jb-dev
* commit '5f4e1ac6ee30784e458df3d90c0950595ad810a6':
  add 'small' style for long headings in Training courses
2012-09-11 14:44:07 -07:00
Scott Main
5f4e1ac6ee am ee7cb463: Merge "add \'small\' style for long headings in Training courses" into jb-dev
* commit 'ee7cb4637dd257e0f9610ed87d14ab10d07bd106':
  add 'small' style for long headings in Training courses
2012-09-11 14:42:43 -07:00
Scott Main
ee7cb4637d Merge "add 'small' style for long headings in Training courses" into jb-dev 2012-09-11 14:41:28 -07:00
Scott Main
6b2dc27c08 add 'small' style for long headings in Training courses
Change-Id: I385df22d12ad419ad6883c0e94d3053e7e520a09
2012-09-11 14:27:34 -07:00
Scott Main
9f3dcd75c6 am 08a63c1e: am 243b0dc1: am 65cdbdcd: am 65511c0a: fix script bug. we were running some scripts that are only used in the reference
* commit '08a63c1e4b500bda750323bb9ce2e8bfe9392f09':
  fix script bug. we were running some scripts that are only used in the reference
2012-09-10 17:08:42 -07:00
Scott Main
243b0dc136 am 65cdbdcd: am 65511c0a: fix script bug. we were running some scripts that are only used in the reference
* commit '65cdbdcdf09f8884141b2478e1eb4d48397880d9':
  fix script bug. we were running some scripts that are only used in the reference
2012-09-07 16:19:11 -07:00
Scott Main
65cdbdcdf0 am 65511c0a: fix script bug. we were running some scripts that are only used in the reference
* commit '65511c0a726751e9973486198086d8db6a141455':
  fix script bug. we were running some scripts that are only used in the reference
2012-09-07 16:17:11 -07:00
Scott Main
65511c0a72 fix script bug. we were running some scripts that are only used in the reference
Change-Id: I0693a7a7af5e41283942b387e53a254903b83427
2012-09-07 15:51:32 -07:00
Conley Owens
aa1e31358a am ef502c6d: am 52bd431e: am d65bb799: am 86ffa1cd: am 5da7ec4f: Merge "Follow symlinks in findleaves"
* commit 'ef502c6da0933e7eb51ff769a61c8321d51573a1':
  Follow symlinks in findleaves
2012-09-04 11:12:56 -07:00
Conley Owens
52bd431e37 am d65bb799: am 86ffa1cd: am 5da7ec4f: Merge "Follow symlinks in findleaves"
* commit 'd65bb799ab31699067fd3b61b106a067575b154f':
  Follow symlinks in findleaves
2012-09-04 11:08:16 -07:00
Conley Owens
86ffa1cd63 am 5da7ec4f: Merge "Follow symlinks in findleaves"
* commit '5da7ec4fbdc8c2ac30f7dafb33327e9bfa337d5b':
  Follow symlinks in findleaves
2012-09-04 10:29:43 -07:00
Conley Owens
d8a3285797 Follow symlinks in findleaves
If we replace the project directories with symlinks to the actual
directories, everything should build fine.  Unfortunately, without
this fix, it does not.

Change-Id: Id19fef9696d0f599a7b3a14b6a8fc10ae857f9c7
2012-08-24 16:24:45 -07:00
Jean-Baptiste Queru
8175d1aeb0 am d163c8ed: am 781a83ae: am 83af736f: am 5ac65f86: Merge "Fix reporting wrong error message for zipalign output file"
* commit 'd163c8eda25ff1c2e4de5a981331ab7e77aaeea1':
  Fix reporting wrong error message for zipalign output file
2012-08-24 07:38:50 -07:00
Jean-Baptiste Queru
781a83ae12 am 83af736f: am 5ac65f86: Merge "Fix reporting wrong error message for zipalign output file"
* commit '83af736f28c03bcac552f83bc645433925135c7e':
  Fix reporting wrong error message for zipalign output file
2012-08-24 07:30:00 -07:00
Jean-Baptiste Queru
83af736f28 am 5ac65f86: Merge "Fix reporting wrong error message for zipalign output file"
* commit '5ac65f869601df5e73fb84b67e57af8ef95cc3bf':
  Fix reporting wrong error message for zipalign output file
2012-08-23 15:09:15 -07:00
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
2f64442926 am 5f0e7aee: am b32161a2: change recovery partition construction to use resource .dat
* commit '5f0e7aee9d5e91f7e1b039607d5cbb503cf7a3b5':
  change recovery partition construction to use resource .dat
2012-08-21 10:54:01 -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
3f7ef927e1 am 024380b9: am 1e448946: 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 '024380b9329fc286f9f8f7f42bb96938f9bff745':
  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:07:02 -07: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
1bd26d3c87 am 18cb0198: am 6937a447: Merge "load SYSTEM/build.prop into the info_dict" into jb-mr1-dev
* commit '18cb0198efe5fa245765becfd310f801ab7faa39':
  load SYSTEM/build.prop into the info_dict
2012-08-17 13:19:54 -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
88155422f2 More product debugging.
Change-Id: I17b5d441e44ea39564263b32f963e2d3ac684232
2012-08-16 22:45:56 -07:00
Joe Onorato
35f74c479c host modules don't need LOCAL_MODULE_TAGS
Change-Id: Ifec8e63eef512b281eb924ef92160e9e1bf97f6d
2012-08-16 22:45:56 -07:00
Joe Onorato
8967523958 Add tool to parse make dependency info from new --deps flag.
Change-Id: I59a88027d88cceee9f2933c84379612698952043
2012-08-16 22:45:55 -07:00
Joe Onorato
b5318d10cb Use a more modern -j flag.
Change-Id: I2498139dd41637a795ca43f830c952adb2856d83
2012-08-16 22:45:55 -07:00
Joe Onorato
8b46e302e6 make product-graph now filtered
Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208
2012-08-16 22:45:55 -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
Robert Ly
fd1eb13b33 pdk templates for docs
Change-Id: Ic1f780c0a8b62bf6e989dc4e1876e24e4cb6c179
2012-08-15 15:33:46 -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
eec51e5d0e am d493f118: am d3ee366a: am 021ff2ee: am 9edfa6db: docs: move home.css into default.css to reduce number of requests
* commit 'd493f118691ae67dd241775455062ee5ccf58f40':
  docs: move home.css into default.css to reduce number of requests
2012-08-14 18:14: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
61a9cc1a4d am d3eb5e5b: am 24cd2803: allow diff program to be selected explicitly
* commit 'd3eb5e5b3648fc3ead3aa4d27124a06875f9878e':
  allow diff program to be selected explicitly
2012-08-14 16:53:47 -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
ffdadef5ca am 4587a9c2: am 0207498d: am c8b7dfb1: am 0e71cee2: docs: make landing pages w/o image span the full page width
* commit '4587a9c2d49e7695eee7bccdbfad56b45c116a0d':
  docs: make landing pages w/o image span the full page width
2012-08-08 12:54:29 -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
Elliott Hughes
5e21b3b405 Merge "Remove the obsolete bin2asm tool." 2012-08-08 09:49:16 -07:00
Elliott Hughes
6d722494cb Remove the obsolete bin2asm tool.
We haven't used this to assemble the ICU data into a .o file since
like Eclair.

Change-Id: I34d903aa1be31244c63f7d60afa90df9a3e6c21e
2012-08-08 09:44:05 -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