Commit Graph

10623 Commits

Author SHA1 Message Date
Elliott Hughes 0b89c64fc4 am 2d17b1ab: resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aosp
* commit '2d17b1aba6ea529dc618d50c784f69fb7f1a8141':
  Build only modules required by the current product.
  Load only the current product config makefile.
  Run clean steps in only given paths when using mm/mmm
2012-10-03 12:19:35 -07:00
Elliott Hughes 2d17b1aba6 resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aosp
Change-Id: I66481eb8b269775716f79e42e9d89c2ebbd45288
2012-10-03 12:13:38 -07:00
Elliott Hughes 01b2aaaa89 am 69a49f75: Merge changes I21eb93f3,I0be5e272,I158b0d7e
* commit '69a49f75860b4849fd1c2fe68d97fa2243171131':
  Build only modules required by the current product.
  Load only the current product config makefile.
  Run clean steps in only given paths when using mm/mmm
2012-10-03 11:55:24 -07:00
Elliott Hughes 69a49f7586 Merge changes I21eb93f3,I0be5e272,I158b0d7e
* changes:
  Build only modules required by the current product.
  Load only the current product config makefile.
  Run clean steps in only given paths when using mm/mmm
2012-10-03 11:29:24 -07:00
Ying Wang e37c3dc3f6 Build only modules required by the current product.
Don't build modules_to_check by default.
Instead add "checkbuild" to the command line as a build goal, if you
want to build everything.
We can use the "checkbuild" goal to make sure some build targets on the
build server still build everything.

(cherry-pick of 5a88269ad6ed44fb163f96847954faac21292567.)

Bug: 7253452
Change-Id: I21eb93f3cb430c9531fe41a2f5d7b445c09938b9
2012-10-03 10:27:31 -07:00
Ying Wang 0c4eb41885 Load only the current product config makefile.
To reduce the start time.
With the change and previous change of doing clean step in only given paths,
start time of mm/mmm is reduced from ~5s to about 1s;
lunch time is reduced from ~40s to 3.5s.

(cherry-pick of 157a5e1695593f935c3223430f4530e21f990378.)

Bug: 7186768,7169854
Change-Id: I0be5e2721efa66a80f112acf8f95e177ebc2f65b
2012-10-03 10:27:08 -07:00
Ying Wang e113fb1d41 Run clean steps in only given paths when using mm/mmm
To speed up mm/mmm start time.
At the same time, we should copy over the other clean steps.

(cherry-pick of 6ea58cb3dc564ce112b28f1a7c6936317168d931.)

Bug: 7186768
Change-Id: I158b0d7e4ecaa773ec3a336cd326e27ee8c26a88
2012-10-03 10:26:36 -07:00
The Android Open Source Project 71eef22e4a am 3ee91251: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '3ee91251be45830522c6a0aa8d2c145b08b5f327':
  JOP03
  JOP02B
2012-10-03 07:34:39 -07:00
The Android Open Source Project 3ee91251be Reconcile with jb-mr1-release - do not merge
Change-Id: Ice6704d7d776ae5efb5ec251fe9809054807c119
2012-10-03 07:33:07 -07:00
The Android Automerger c27010430d JOP03 2012-10-03 07:01:14 -07:00
The Android Automerger 8f39e4524d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-03 06:59:14 -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 71507e9b62 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 'cd67e0e13e28f2b98b05aa6dc5385242123b1fb2':
  adjust position of prev/next links at bottom of page to account for russian string length
2012-10-02 23:36:38 -07:00
Scott Main cd67e0e13e 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 '8cb3263dd0cc35b16f74fefe154988da35e1a4ab':
  adjust position of prev/next links at bottom of page to account for russian string length
2012-10-02 23:34:26 -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 9341d398a8 am a4888dc8: adjust position of prev/next links at bottom of page to account for russian string length
* commit 'a4888dc8657c46ff3fec9ae2e840432255d40a88':
  adjust position of prev/next links at bottom of page to account for russian string length
2012-10-02 23:30:35 -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 242f2c6e32 am ae454082: (-s ours) am b41d19c9: am e41404f4: am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
* commit 'ae454082c601dcf0da6203146340f71d532cf2fb':
  DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
2012-10-02 21:12:51 -07:00
Scott Main 8ce5b7e4de am a9334f27: (-s ours) am 6190ac59: am a168a83a: am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
* commit 'a9334f275226ca70cd2af2409e65383b03c76af1':
  DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
2012-10-02 21:12:50 -07:00
Scott Main ae454082c6 am b41d19c9: am e41404f4: am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
* commit 'b41d19c9abe98b59b095e2722993ed96ee287748':
  DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
2012-10-02 21:11:20 -07:00
Scott Main a9334f2752 am 6190ac59: am a168a83a: am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
* commit '6190ac593ab0188acc274ef40504bd71c2a76e27':
  DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
2012-10-02 21:11:19 -07:00
Scott Main 54abd7c7d0 am c9dcdae5: (-s ours) am 155a16ab: am 86834682: am 4f5f71a1: (-s ours) am f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
* commit 'c9dcdae58b9026b4a2100ce86442b891c9f77beb':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
2012-10-02 21:10:22 -07:00
Scott Main b41d19c9ab am e41404f4: am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
* commit 'e41404f496002a24f670f6c16f3fbae07b10ce3e':
  DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
2012-10-02 21:09:30 -07:00
Scott Main 6190ac593a am a168a83a: am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
* commit 'a168a83a8940eea54ee66bb7610a63ce49c67874':
  DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
2012-10-02 21:09:29 -07:00
Scott Main f516842c4b am 3ab65fa6: (-s ours) am a6481fe7: am 3ef75927: am 589622a4: (-s ours) am e0cc9e30: am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
* commit '3ab65fa6fbcefc2e0dffca0845dd1deae4099dc9':
  DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
2012-10-02 21:08:58 -07:00
Scott Main c9dcdae58b am 155a16ab: am 86834682: am 4f5f71a1: (-s ours) am f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
* commit '155a16aba065f115cae3d4f65e2a42dfcd3b6672':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
2012-10-02 21:07:49 -07:00
Scott Main e41404f496 am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
* commit '83fca03d080b88d5ecda75f6c5b5a1f44fa25d8f':
  DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
2012-10-02 21:07:42 -07:00
Scott Main a168a83a89 am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
* commit 'c914b5bf5224f2d5fcc24026c35c2e4ffd7588d7':
  DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
2012-10-02 21:07:40 -07:00
Scott Main 0c15f05b58 am 07cf8992: (-s ours) am 94bb600f: am eb0bce61: am 6856ef5b: (-s ours) am 61e63c8a: am 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
* commit '07cf89927f245e651696d2ff890b0439818611ea':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
2012-10-02 21:06:26 -07:00
Scott Main 3ab65fa6fb am a6481fe7: am 3ef75927: am 589622a4: (-s ours) am e0cc9e30: am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
* commit 'a6481fe7e4b2702092f1d21e7f3ac3b1ab6b3576':
  DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
2012-10-02 21:06:21 -07:00
Scott Main 155a16aba0 am 86834682: am 4f5f71a1: (-s ours) am f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
* commit '868346827c5e1f5939c3669ee24c75da4489181e':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
2012-10-02 21:06:00 -07:00
Scott Main 83fca03d08 am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
* commit '5150b1f770301f5359c07da1be5ce0fdaf342ba9':
  DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
2012-10-02 21:05:26 -07:00
Scott Main c914b5bf52 am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
* commit '142158bd218421741d6d133e9ebbb1203ae6e6a6':
  DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
2012-10-02 21:05:25 -07:00
Scott Main 07cf89927f am 94bb600f: am eb0bce61: am 6856ef5b: (-s ours) am 61e63c8a: am 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
* commit '94bb600f522e3a6599c66a86aa66f4aba9d41796':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
2012-10-02 21:04:53 -07:00
Scott Main a6481fe7e4 am 3ef75927: am 589622a4: (-s ours) am e0cc9e30: am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
* commit '3ef7592761cacc3ac5f77576904b3bfb30e066ab':
  DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
2012-10-02 21:04:32 -07:00
Scott Main 5150b1f770 am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
* commit 'f3d0104a8039af22daab02a914c6639fe078c9a6':
  DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
2012-10-02 21:04:28 -07:00
Scott Main 868346827c am 4f5f71a1: (-s ours) am f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
* commit '4f5f71a17d8963acf3642c91e3fb711d5f11a99c':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
2012-10-02 21:04:11 -07:00
Scott Main 142158bd21 am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
* commit '6eb95f1ac83a02a7bdb68cdcc5a09e7079ff46c0':
  DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
2012-10-02 21:03:18 -07:00
Scott Main 94bb600f52 am eb0bce61: am 6856ef5b: (-s ours) am 61e63c8a: am 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
* commit 'eb0bce61d7d150e2f9a7f4aa1eed11b91645c0a2':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
2012-10-02 21:03:07 -07:00
Scott Main 4f5f71a17d am f5878b3e: am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
* commit 'f5878b3ea31a04d13888f14bd652340da8a38437':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
2012-10-02 21:03:01 -07:00
Scott Main 3ef7592761 am 589622a4: (-s ours) am e0cc9e30: am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
* commit '589622a47da216ab2b31e94011ae9985e4029891':
  DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
2012-10-02 21:02:46 -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 f5878b3ea3 am aa2ce5d9: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
* commit 'aa2ce5d9aa16d72e4f5c4203bc9a8c6f87d83719':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455 add localize langs for global strings
2012-10-02 21:01:07 -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 589622a47d am e0cc9e30: am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
* commit 'e0cc9e30520b0fb7690b3f4724fc0ce77c7f03e4':
  DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
2012-10-02 21:00:33 -07:00
Scott Main eb0bce61d7 am 6856ef5b: (-s ours) am 61e63c8a: am 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
* commit '6856ef5b07b128ecb5daa966f7486503b9cc5f20':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
2012-10-02 21:00:19 -07:00
Scott Main 6856ef5b07 am 61e63c8a: am 52948fcf: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
* commit '61e63c8a4bdb6174a08023d4b55fe2af896ed878':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
2012-10-02 20:59:09 -07:00
Scott Main e0cc9e3052 am 24bbcd50: (-s ours) DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
* commit '24bbcd5026cd8de5a77cd09ec8754753fff2280b':
  DO NOT MERGE cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170 add style for code captions; ignore sidenav headers for HRs
2012-10-02 20:58:54 -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