OSDN Git Service
Jeff Sharkey [Fri, 8 Mar 2013 18:53:04 +0000 (18:53 +0000)]
Merge "Function to grep AndroidManifest.xml files." into jb-mr2-dev
Jeff Sharkey [Fri, 8 Mar 2013 18:20:47 +0000 (10:20 -0800)]
Function to grep AndroidManifest.xml files.
Change-Id: I1998a9d6a05176fc7fc8643c5d1c40e2dd699d4e
Ying Wang [Fri, 8 Mar 2013 02:57:52 +0000 (18:57 -0800)]
am
11872e25: am
c47bea9d: Merge "Remove nonexisting module names."
* commit '
11872e259252ffa45874c8e3ebe38a3c41bbd579':
Remove nonexisting module names.
Christopher Ferris [Fri, 8 Mar 2013 02:57:51 +0000 (18:57 -0800)]
am
b95a4ed6: am
161e0ef9: Merge "Adding TARGET_CPU_VARIANT to config file."
* commit '
b95a4ed64aff542d04b667ff5f239d152735808a':
Adding TARGET_CPU_VARIANT to config file.
Ying Wang [Fri, 8 Mar 2013 02:55:30 +0000 (18:55 -0800)]
am
c47bea9d: Merge "Remove nonexisting module names."
* commit '
c47bea9dd9288bf429afe1434829afd5e8c208a0':
Remove nonexisting module names.
Christopher Ferris [Fri, 8 Mar 2013 02:55:29 +0000 (18:55 -0800)]
am
161e0ef9: Merge "Adding TARGET_CPU_VARIANT to config file."
* commit '
161e0ef974d0cddf74b82bbe9c0843ca6f2f320e':
Adding TARGET_CPU_VARIANT to config file.
Ying Wang [Fri, 8 Mar 2013 02:30:48 +0000 (02:30 +0000)]
Merge "Remove nonexisting module names."
Ying Wang [Fri, 8 Mar 2013 02:28:53 +0000 (18:28 -0800)]
Remove nonexisting module names.
Change-Id: I825de45f1b982e4aa391b11bf18ba90432272fa7
Christopher Ferris [Fri, 8 Mar 2013 02:18:08 +0000 (02:18 +0000)]
Merge "Adding TARGET_CPU_VARIANT to config file."
Christopher Ferris [Sat, 23 Feb 2013 01:24:25 +0000 (17:24 -0800)]
Adding TARGET_CPU_VARIANT to config file.
Adding this since all arm builds will require TARGET_CPU_VARIANT
to be set to a valid value in the near future.
Merge from internal master.
Change-Id: I2b73f9dbdd04cd8ac47035875c714bd0e75920e7
Ying Wang [Fri, 8 Mar 2013 01:58:32 +0000 (17:58 -0800)]
resolved conflicts for merge of
de949b11 to jb-mr2-dev
Change-Id: I5a4c8cefeaf9e2f27be4b7ed8e4b30cb5a83a2f5
Ying Wang [Fri, 8 Mar 2013 01:49:44 +0000 (17:49 -0800)]
am
671d90ea: Merge "Add module names to emulator PRODUCT_PACKAGES."
* commit '
671d90ea1d20312df60b700748d49dac17054099':
Add module names to emulator PRODUCT_PACKAGES.
Ying Wang [Fri, 8 Mar 2013 01:15:00 +0000 (01:15 +0000)]
Merge "Add module names to emulator PRODUCT_PACKAGES."
Tim Murray [Thu, 7 Mar 2013 23:34:11 +0000 (23:34 +0000)]
Merge "Add support for multiple architectures with RS compat lib." into jb-mr2-dev
Doug Zongker [Thu, 7 Mar 2013 22:34:00 +0000 (22:34 +0000)]
Merge "recovery: choose between available fonts based on device density" into jb-mr2-dev
Justin Ho [Thu, 7 Mar 2013 20:34:22 +0000 (20:34 +0000)]
Merge "Add fr_CA to l10n builds Bug:
7579865" into jb-mr2-dev
Justin Ho [Thu, 7 Mar 2013 20:27:44 +0000 (12:27 -0800)]
Add fr_CA to l10n builds
Bug:
7579865
Change-Id: I92c1368b97ced96cacc560d829707b9b7de69ef4
Scott Main [Thu, 7 Mar 2013 20:21:27 +0000 (12:21 -0800)]
am
e2b31818: am
5b654685: am
7b21b887: am
3797ec57: am
288099b2: am
a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
* commit '
e2b31818d6b5c27de1cbebaeb3ca5362c5ab1f9a':
Scott Main [Thu, 7 Mar 2013 20:21:26 +0000 (12:21 -0800)]
am
43403d90: am
774274d0: am
a8a80d78: am
5a0e36fe: am
415696d3: am
f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
* commit '
43403d905a65e21ec12ec3f6c64d566e7fe7a35f':
Scott Main [Thu, 7 Mar 2013 20:21:26 +0000 (12:21 -0800)]
am
a525786f: am
c4f84cbb: am
6f0172c4: am
e99ca7ae: am
2990dc10: am
578d6446: docs: move loading of google ref into doc load event to prevent error during load
* commit '
a525786f825389565314361e3255bfd3d713c9a3':
Jean-Baptiste Queru [Thu, 7 Mar 2013 20:21:25 +0000 (12:21 -0800)]
am
c26c52a6: am
e47881e6: am
f8372271: (-s ours) am
17cbfdda: (-s ours) am
76bbd39a: (-s ours) am
22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
c26c52a6a0d097e2e28804347d8b0ada758109fa':
Scott Main [Thu, 7 Mar 2013 20:21:24 +0000 (12:21 -0800)]
am
aaf22c8d: am
70e053fb: am
f6c979e0: am
bfeae36e: am
68510e25: am
9f2971d1: docs: fix suggestions due to file name change for js files
* commit '
aaf22c8dd864c9bb8944106d4196969e950d2163':
Scott Main [Thu, 7 Mar 2013 20:21:24 +0000 (12:21 -0800)]
am
fc3a4e31: am
7c1cde1d: am
1cccea9b: am
cdf32e84: am
e892c86e: am
7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
* commit '
fc3a4e31edb22e0f908bdf8b73a0ce58abf1b9c2':
Ken Sumrall [Thu, 7 Mar 2013 20:21:23 +0000 (12:21 -0800)]
Scott Main [Thu, 7 Mar 2013 20:21:23 +0000 (12:21 -0800)]
Scott Main [Thu, 7 Mar 2013 20:21:22 +0000 (12:21 -0800)]
am
d1fa8591: am
9ae44c9d: am
589b4b3e: am
956d4c70: am
373318ca: am
0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
* commit '
d1fa85916dd2066fc1030682ecfd75639804bd1f':
Robert Ly [Thu, 7 Mar 2013 20:21:21 +0000 (12:21 -0800)]
am
9ac8c78d: am
dfc239ce: am
e28696da: am
116c59bb: am
cef5be2d: am
dae7b523: Revert "support differently named lists.js files"
* commit '
9ac8c78dfee09a6d9769e1fac024fee08070e3b7':
Scott Main [Thu, 7 Mar 2013 20:21:21 +0000 (12:21 -0800)]
am
50e9bdd0: am
c8141407: am
40741e48: am
4cc2bc77: am
a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
* commit '
50e9bdd0a4f3ef75ea7b76c553422fbaf72c7256':
switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
Scott Main [Thu, 7 Mar 2013 19:49:23 +0000 (11:49 -0800)]
am
5b654685: am
7b21b887: am
3797ec57: am
288099b2: am
a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
* commit '
5b654685c08f51c94a0d269831228632cf6b281c':
Scott Main [Thu, 7 Mar 2013 19:49:22 +0000 (11:49 -0800)]
am
774274d0: am
a8a80d78: am
5a0e36fe: am
415696d3: am
f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
* commit '
774274d0e6ab8fa7218033cf1d058f6b6de2149c':
Scott Main [Thu, 7 Mar 2013 19:49:22 +0000 (11:49 -0800)]
am
c4f84cbb: am
6f0172c4: am
e99ca7ae: am
2990dc10: am
578d6446: docs: move loading of google ref into doc load event to prevent error during load
* commit '
c4f84cbb933e23fe176d5909a294d54cbfa315b0':
Jean-Baptiste Queru [Thu, 7 Mar 2013 19:49:21 +0000 (11:49 -0800)]
am
e47881e6: am
f8372271: (-s ours) am
17cbfdda: (-s ours) am
76bbd39a: (-s ours) am
22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
e47881e655a687a7132af6647b8bcc2fdc784714':
Scott Main [Thu, 7 Mar 2013 19:49:20 +0000 (11:49 -0800)]
am
70e053fb: am
f6c979e0: am
bfeae36e: am
68510e25: am
9f2971d1: docs: fix suggestions due to file name change for js files
* commit '
70e053fbdcae0fcfd684409f957bd7e6734c4827':
Scott Main [Thu, 7 Mar 2013 19:49:20 +0000 (11:49 -0800)]
am
7c1cde1d: am
1cccea9b: am
cdf32e84: am
e892c86e: am
7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
* commit '
7c1cde1d90108c3fdd15c38e17f72fc5ca09e6e1':
Ken Sumrall [Thu, 7 Mar 2013 19:49:19 +0000 (11:49 -0800)]
am
fa84cfd1: am
f1a6ba57: am
4c5b0bf4: am
8d3e1e55: am
44281a1f: Add unified fstab support to release tools
* commit '
fa84cfd18161df6631af7c1b2be96b4ec3ee7174':
Scott Main [Thu, 7 Mar 2013 19:49:19 +0000 (11:49 -0800)]
Scott Main [Thu, 7 Mar 2013 19:49:18 +0000 (11:49 -0800)]
am
9ae44c9d: am
589b4b3e: am
956d4c70: am
373318ca: am
0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
* commit '
9ae44c9da7966c2f43d5e22871a65a16cf10b4cc':
Robert Ly [Thu, 7 Mar 2013 19:49:18 +0000 (11:49 -0800)]
am
dfc239ce: am
e28696da: am
116c59bb: am
cef5be2d: am
dae7b523: Revert "support differently named lists.js files"
* commit '
dfc239ce8692b542048670927bf7d46d9527d32f':
Scott Main [Thu, 7 Mar 2013 19:49:17 +0000 (11:49 -0800)]
am
c8141407: am
40741e48: am
4cc2bc77: am
a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
* commit '
c8141407eff4577abae3740bb2a6abf881c6c17c':
switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
Scott Main [Thu, 7 Mar 2013 19:45:38 +0000 (11:45 -0800)]
am
7b21b887: am
3797ec57: am
288099b2: am
a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
* commit '
7b21b8873f7c511203779710f5791b1b7692f082':
Scott Main [Thu, 7 Mar 2013 19:45:38 +0000 (11:45 -0800)]
am
a8a80d78: am
5a0e36fe: am
415696d3: am
f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
* commit '
a8a80d78e7a94f6981d2f5916ca9b6e944be8a14':
Scott Main [Thu, 7 Mar 2013 19:45:37 +0000 (11:45 -0800)]
am
6f0172c4: am
e99ca7ae: am
2990dc10: am
578d6446: docs: move loading of google ref into doc load event to prevent error during load
* commit '
6f0172c4140ac0d3de2ceadc93e6e10b4b8ef051':
Jean-Baptiste Queru [Thu, 7 Mar 2013 19:45:36 +0000 (11:45 -0800)]
am
f8372271: (-s ours) am
17cbfdda: (-s ours) am
76bbd39a: (-s ours) am
22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
f83722715237d0e80297e7d22ee5dd79d0624fe7':
Scott Main [Thu, 7 Mar 2013 19:45:35 +0000 (11:45 -0800)]
am
f6c979e0: am
bfeae36e: am
68510e25: am
9f2971d1: docs: fix suggestions due to file name change for js files
* commit '
f6c979e03f0ac1748e5fbf8ed689b2e0c031e64a':
Scott Main [Thu, 7 Mar 2013 19:45:34 +0000 (11:45 -0800)]
am
1cccea9b: am
cdf32e84: am
e892c86e: am
7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
* commit '
1cccea9b400a93d6154158c6167619a3a10c8998':
Ken Sumrall [Thu, 7 Mar 2013 19:45:33 +0000 (11:45 -0800)]
am
f1a6ba57: am
4c5b0bf4: am
8d3e1e55: am
44281a1f: Add unified fstab support to release tools
* commit '
f1a6ba578967277b351b646755132eea3c87240a':
Scott Main [Thu, 7 Mar 2013 19:45:32 +0000 (11:45 -0800)]
am
3707041b: am
d3622632: am
8ced7e63: am
d6cb8fac: docs: fix padding for left-figure class
* commit '
3707041ba7f638e510c5300170f0a09fceb8d81e':
Scott Main [Thu, 7 Mar 2013 19:45:32 +0000 (11:45 -0800)]
am
589b4b3e: am
956d4c70: am
373318ca: am
0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
* commit '
589b4b3ea983aab1825cb1aea24d072a4a757b70':
Robert Ly [Thu, 7 Mar 2013 19:45:31 +0000 (11:45 -0800)]
am
e28696da: am
116c59bb: am
cef5be2d: am
dae7b523: Revert "support differently named lists.js files"
* commit '
e28696da0ab977dbf4823c2e5a4d1355fe516a32':
Scott Main [Thu, 7 Mar 2013 19:45:31 +0000 (11:45 -0800)]
am
40741e48: am
4cc2bc77: am
a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
* commit '
40741e48984d2c3173378f4aa497d2e848e74e7a':
switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
Scott Main [Thu, 7 Mar 2013 19:42:45 +0000 (11:42 -0800)]
am
3797ec57: am
288099b2: am
a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
* commit '
3797ec576e436c5c5a4991eeca85be0ef21ff173':
Scott Main [Thu, 7 Mar 2013 19:42:45 +0000 (11:42 -0800)]
am
5a0e36fe: am
415696d3: am
f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
* commit '
5a0e36fe69bda665b4c4d5aaa3c1f4de57bf883c':
Scott Main [Thu, 7 Mar 2013 19:42:44 +0000 (11:42 -0800)]
am
e99ca7ae: am
2990dc10: am
578d6446: docs: move loading of google ref into doc load event to prevent error during load
* commit '
e99ca7ae6d60761c7d80d4a3bddc018fb16952b4':
Jean-Baptiste Queru [Thu, 7 Mar 2013 19:42:43 +0000 (11:42 -0800)]
am
17cbfdda: (-s ours) am
76bbd39a: (-s ours) am
22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
17cbfdda28584c5e5fbf67237b8250a1e48e77bd':
Scott Main [Thu, 7 Mar 2013 19:42:43 +0000 (11:42 -0800)]
am
bfeae36e: am
68510e25: am
9f2971d1: docs: fix suggestions due to file name change for js files
* commit '
bfeae36ec422e9ee5e75f521e5e0f73787ed0010':
Scott Main [Thu, 7 Mar 2013 19:42:42 +0000 (11:42 -0800)]
am
cdf32e84: am
e892c86e: am
7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
* commit '
cdf32e840136c7d6357e1ebf8b9c248c889b0011':
Ken Sumrall [Thu, 7 Mar 2013 19:42:42 +0000 (11:42 -0800)]
am
4c5b0bf4: am
8d3e1e55: am
44281a1f: Add unified fstab support to release tools
* commit '
4c5b0bf4b8acbe56fa80b8a69b5de3a48701d8df':
Scott Main [Thu, 7 Mar 2013 19:42:41 +0000 (11:42 -0800)]
am
d3622632: am
8ced7e63: am
d6cb8fac: docs: fix padding for left-figure class
* commit '
d3622632fa1c0fea56eb3bb927d9cff43996c9d9':
Scott Main [Thu, 7 Mar 2013 19:42:41 +0000 (11:42 -0800)]
am
956d4c70: am
373318ca: am
0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
* commit '
956d4c702bc71873db40829169556d75fc4aa75e':
Robert Ly [Thu, 7 Mar 2013 19:42:40 +0000 (11:42 -0800)]
am
116c59bb: am
cef5be2d: am
dae7b523: Revert "support differently named lists.js files"
* commit '
116c59bbb7220c64d362d55463083b51db2f687c':
Scott Main [Thu, 7 Mar 2013 19:42:39 +0000 (11:42 -0800)]
am
4cc2bc77: am
a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
* commit '
4cc2bc776392c9cabaa4983bf99844d6631b3560':
switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
Scott Main [Thu, 7 Mar 2013 02:10:51 +0000 (18:10 -0800)]
am
288099b2: am
a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
* commit '
288099b27b17e057ffb954aae14f2cc7e7aab3fd':
Scott Main [Thu, 7 Mar 2013 02:10:50 +0000 (18:10 -0800)]
am
415696d3: am
f8333457: Revert "docs: move loading of google ref into doc load event to prevent error during load"
* commit '
415696d3f1a07b801fa7b0d73bb9e6040c5cedb4':
Scott Main [Thu, 7 Mar 2013 02:10:50 +0000 (18:10 -0800)]
am
2990dc10: am
578d6446: docs: move loading of google ref into doc load event to prevent error during load
* commit '
2990dc1076619ae890c4dd171b655bb88d4eee94':
Jean-Baptiste Queru [Thu, 7 Mar 2013 02:10:49 +0000 (18:10 -0800)]
am
76bbd39a: (-s ours) am
22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
76bbd39a91e87ab39ce866f3b8682a28729d16f2':
Scott Main [Thu, 7 Mar 2013 02:10:49 +0000 (18:10 -0800)]
am
68510e25: am
9f2971d1: docs: fix suggestions due to file name change for js files
* commit '
68510e25089af27d680c88c5154d04ea7817ca01':
Scott Main [Thu, 7 Mar 2013 02:10:48 +0000 (18:10 -0800)]
am
e892c86e: am
7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources
* commit '
e892c86ef93cb96abf2b76e59bcaacd5a759f2f2':
Ken Sumrall [Thu, 7 Mar 2013 02:10:48 +0000 (18:10 -0800)]
am
8d3e1e55: am
44281a1f: Add unified fstab support to release tools
* commit '
8d3e1e55737354ef05f23d225c61fc98472d61e7':
Scott Main [Thu, 7 Mar 2013 02:10:47 +0000 (18:10 -0800)]
am
8ced7e63: am
d6cb8fac: docs: fix padding for left-figure class
* commit '
8ced7e638c65268dfcde3dd8ca49dc0c573087cd':
Scott Main [Thu, 7 Mar 2013 02:10:47 +0000 (18:10 -0800)]
am
373318ca: am
0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
* commit '
373318caf6234dcb3c9f2f5a19bc8528980adcec':
Robert Ly [Thu, 7 Mar 2013 02:10:46 +0000 (18:10 -0800)]
am
cef5be2d: am
dae7b523: Revert "support differently named lists.js files"
* commit '
cef5be2d834298d8f0e6099b59f347343eeafe91':
Scott Main [Thu, 7 Mar 2013 02:08:38 +0000 (18:08 -0800)]
am
a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
* commit '
a07be8eee4be0814b866cc79d35bf67cb30768ab':
switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
Scott Main [Thu, 7 Mar 2013 02:08:37 +0000 (18:08 -0800)]
am
a07be8ee: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
* commit '
a07be8eee4be0814b866cc79d35bf67cb30768ab':
switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
Tim Murray [Tue, 5 Mar 2013 19:07:15 +0000 (11:07 -0800)]
Add support for multiple architectures with RS compat lib.
Change-Id: I310f6f72e1124c06e9c59b0f59d33f168dc1e632
Doug Zongker [Wed, 6 Mar 2013 23:04:31 +0000 (15:04 -0800)]
recovery: choose between available fonts based on device density
Change-Id: I39aded4e1fb310d7e4b9c9ed3356686fcf62c002
Ying Wang [Wed, 6 Mar 2013 22:34:57 +0000 (22:34 +0000)]
am
c36a4b6e: am
18be7ab2: Merge "Stash TARGET_CPU_VARIANT and print it in dumpvar."
* commit '
c36a4b6ea93e5cd4743129b0534a61c6ce4a9aa2':
Stash TARGET_CPU_VARIANT and print it in dumpvar.
Ying Wang [Wed, 6 Mar 2013 22:32:05 +0000 (14:32 -0800)]
am
18be7ab2: Merge "Stash TARGET_CPU_VARIANT and print it in dumpvar."
* commit '
18be7ab2c982df72470f495d4458560538ba3114':
Stash TARGET_CPU_VARIANT and print it in dumpvar.
Ying Wang [Wed, 6 Mar 2013 21:55:33 +0000 (21:55 +0000)]
Merge "Stash TARGET_CPU_VARIANT and print it in dumpvar."
Ben Cheng [Tue, 15 Jan 2013 22:36:42 +0000 (14:36 -0800)]
Stash TARGET_CPU_VARIANT and print it in dumpvar.
Bug:
7961327
Merged from internal master.
Change-Id: Ia78472ba53ae1221de4572119aa5c63246941eeb
Ying Wang [Wed, 6 Mar 2013 20:13:29 +0000 (20:13 +0000)]
am
b3f5d56f: am
5085447f: Merge "Don\'t install all host modules by default."
* commit '
b3f5d56f65022ece632134a277c0610355272a04':
Don't install all host modules by default.
Scott Main [Wed, 6 Mar 2013 20:12:21 +0000 (12:12 -0800)]
switch code font to pure monospace (sans serif).
also add proper margins for elements nested in lists
Change-Id: I1c2914904da63d21359283de945c9805f5d4af93
Ying Wang [Wed, 6 Mar 2013 20:11:16 +0000 (12:11 -0800)]
am
5085447f: Merge "Don\'t install all host modules by default."
* commit '
5085447f7f4c71e61c24f9d26df1e48a7a9d03ca':
Don't install all host modules by default.
Ying Wang [Wed, 6 Mar 2013 19:48:39 +0000 (19:48 +0000)]
Merge "Don't install all host modules by default."
Ying Wang [Wed, 5 Sep 2012 19:48:52 +0000 (12:48 -0700)]
Don't install all host modules by default.
Instead we should explicitly set up the dependency, if the module will
be used in the build process; Use LOCAL_MODULE_TAGS with eng, debug or
tests if the module is for testing; or add to PRODUCT_PACKAGES if it's
required by a product.
Change-Id: Ic26319c26c1166bc1062dfbcfb4e006af185249a
keunyoung [Wed, 6 Mar 2013 02:05:56 +0000 (02:05 +0000)]
Merge "remove reference of emulator vold.fstab which is no longer necessary" into jb-mr2-dev
keunyoung [Wed, 6 Mar 2013 01:44:10 +0000 (17:44 -0800)]
remove reference of emulator vold.fstab which is no longer necessary
Change-Id: I2c8d28060e8204ecbe255cb1e2752e3030dc2d99
keunyoung [Tue, 5 Mar 2013 19:07:52 +0000 (11:07 -0800)]
pull goldfish specific stuffs from emulator.mk
- init.goldfish.rc, init.goldfish.sh, and ueventd.goldfish.rc
Change-Id: Ia4a12477faf727c4e2276313d6d9dcf7ea430b22
Torne (Richard Coles) [Thu, 21 Feb 2013 14:01:35 +0000 (14:01 +0000)]
Support build rules which generate .o files.
webviewchromium has some build rules which use a custom tool to create
.o files from other input (i.e. they are not prebuilt and so can't be
included in LOCAL_PREBUILT_OBJ_FILES). Support adding .o files to
LOCAL_GENERATED_SOURCES and doing the right thing with them (including
them in the static/dynamic library or executable being built).
Bug:
7714333
Change-Id: I3b1d29eeff30aebeafe33398f9bef2eb6972d997
Ying Wang [Tue, 5 Mar 2013 07:09:37 +0000 (07:09 +0000)]
Merge "Move emulator.mk out of full_base.mk" into jb-mr2-dev
Ying Wang [Tue, 5 Mar 2013 06:53:37 +0000 (22:53 -0800)]
Move emulator.mk out of full_base.mk
Instead we should have the emulator products (full, full_mips, full_x86,
sdk) inherit from emulator.mk directly, because full_base.mk is also
inherited by real device products, such as full_manta.mk.
Change-Id: I475f7262eaa65dd85fc844ed357547c76c82598f
Ken Sumrall [Tue, 5 Mar 2013 03:14:26 +0000 (03:14 +0000)]
Merge "Install a unified fstab in the emulator image" into jb-mr2-dev
Ken Sumrall [Fri, 1 Mar 2013 03:19:10 +0000 (19:19 -0800)]
Install a unified fstab in the emulator image
Also, modify the sdk.mk file to undo an earlier change
to add the unified fstab there, and move the include
of the emulator.mk file to after PRODUCT_COPY_FILES
is initially defined.
Change-Id: I7318ebefa1b3043f32e99a9e278fe4667f760aa8
The Android Open Source Project [Tue, 5 Mar 2013 00:56:08 +0000 (00:56 +0000)]
am
564c2b3e: Reconcile with jb-mr1.1-release - do not merge
* commit '
564c2b3e4da71cfe4f1a0c8e15e2c9cec2415eea':
JDQ39B
The Android Open Source Project [Mon, 4 Mar 2013 19:14:54 +0000 (11:14 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ic2017881546bd6488432b9a87196f1c8eb6e5819
The Android Automerger [Mon, 4 Mar 2013 19:08:59 +0000 (11:08 -0800)]
JDQ39B
Ying Wang [Sat, 2 Mar 2013 01:43:28 +0000 (01:43 +0000)]
Merge "Allow to call dist-for-goals multiple times for the same file" into jb-mr2-dev
Ying Wang [Sat, 2 Mar 2013 00:45:35 +0000 (16:45 -0800)]
Allow to call dist-for-goals multiple times for the same file
You can dist the same file for multiple goals in multiple calls to
dist-for-goals. The first call will establish the real copy rule, while
the rest call just establishes the goals' dependency on the dest file.
This enable uss to remove the bizarre $(if ..) enclosing the droid and
sdk dist while avoiding make's multiple rules warning.
Change-Id: I76475db76a9e6167e0e606dd582b54e80dfcdd22
Dave Langemak [Fri, 1 Mar 2013 22:10:40 +0000 (14:10 -0800)]
Add pseudolanguage codes to l10n builds
bug:
8299925
Change-Id: Id4bab811bc3f6660f4ce0a21afb689366d80d795
Ying Wang [Fri, 1 Mar 2013 00:39:32 +0000 (16:39 -0800)]
Add module names to emulator PRODUCT_PACKAGES.
Instead of using "LOCAL_MODULE_TAGS := debug" to install them.
Bug:
8276818
Change-Id: I7eba3c4e6c2f07ebe661522cb0e14afcc3ef7e92
Kenny Root [Thu, 28 Feb 2013 17:48:59 +0000 (17:48 +0000)]
am
14567bb0: am
08d56b4a: Merge "CTS: work around ClassLoader limitation"
* commit '
14567bb00754405fac535bc8be8e46fa8abd7c82':
CTS: work around ClassLoader limitation