OSDN Git Service
Scott Main [Thu, 7 Mar 2013 20:34:17 +0000 (20:34 +0000)]
am
e1bb1d21: am
bbdb87db: am
aaf22c8d: am
70e053fb: am
f6c979e0: am
bfeae36e: am
68510e25: am
9f2971d1: docs: fix suggestions due to file name change for js files
* commit '
e1bb1d21f9b58ba4e8d8ba7f1c97a308c4c18ca9':
Scott Main [Thu, 7 Mar 2013 20:34:16 +0000 (20:34 +0000)]
am
7d6cf6a9: am
df16b698: 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 '
7d6cf6a959637722398011f795240e9f7be2c36d':
Ken Sumrall [Thu, 7 Mar 2013 20:34:16 +0000 (20:34 +0000)]
Scott Main [Thu, 7 Mar 2013 20:34:15 +0000 (20:34 +0000)]
Scott Main [Thu, 7 Mar 2013 20:34:15 +0000 (20:34 +0000)]
am
30f48de6: am
d4119687: 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 '
30f48de61310e10523fa2918c1b8de1762e1e9c1':
Robert Ly [Thu, 7 Mar 2013 20:34:14 +0000 (20:34 +0000)]
Scott Main [Thu, 7 Mar 2013 20:34:14 +0000 (20:34 +0000)]
am
644060a7: am
b8b3406e: 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 '
644060a740506083076d7d0187a7cf7ae912d71c':
switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
Scott Main [Thu, 7 Mar 2013 20:32:05 +0000 (20:32 +0000)]
am
bbdb87db: am
aaf22c8d: am
70e053fb: am
f6c979e0: am
bfeae36e: am
68510e25: am
9f2971d1: docs: fix suggestions due to file name change for js files
* commit '
bbdb87dbf580d862885ddbe276e287c515c67fe8':
Scott Main [Thu, 7 Mar 2013 20:32:05 +0000 (20:32 +0000)]
am
df16b698: 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 '
df16b69845fde1308476a91f26dd42f70f8790e1':
Ken Sumrall [Thu, 7 Mar 2013 20:32:04 +0000 (20:32 +0000)]
Scott Main [Thu, 7 Mar 2013 20:32:03 +0000 (20:32 +0000)]
Scott Main [Thu, 7 Mar 2013 20:32:02 +0000 (20:32 +0000)]
am
d4119687: 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 '
d4119687769585d0f4c2ac216e77843e86ccf338':
Robert Ly [Thu, 7 Mar 2013 20:32:02 +0000 (20:32 +0000)]
am
2f5cdf90: am
9ac8c78d: am
dfc239ce: am
e28696da: am
116c59bb: am
cef5be2d: am
dae7b523: Revert "support differently named lists.js files"
* commit '
2f5cdf903116e882f80d0ae2b2c6b4ce29bacebc':
Scott Main [Thu, 7 Mar 2013 20:32:01 +0000 (20:32 +0000)]
am
b8b3406e: 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 '
b8b3406e6a00edc63b84d3e884c4a36ba5cea1ec':
switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
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: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: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: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: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
Ying Wang [Wed, 6 Mar 2013 22:40:17 +0000 (22:40 +0000)]
am
6ad52c3c: am
099ad657: am
c36a4b6e: am
18be7ab2: Merge "Stash TARGET_CPU_VARIANT and print it in dumpvar."
* commit '
6ad52c3cdac6b77a7cf2ce3825cb23686ff0fe13':
Stash TARGET_CPU_VARIANT and print it in dumpvar.
Ying Wang [Wed, 6 Mar 2013 22:38:46 +0000 (22:38 +0000)]
am
099ad657: am
c36a4b6e: am
18be7ab2: Merge "Stash TARGET_CPU_VARIANT and print it in dumpvar."
* commit '
099ad657da87ec2b040af786bd26de4099dc1d0f':
Stash TARGET_CPU_VARIANT and print it in dumpvar.
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
Jeff Sharkey [Wed, 6 Mar 2013 21:42:56 +0000 (21:42 +0000)]
Merge "Add Terminal app to build."
Ying Wang [Wed, 6 Mar 2013 20:17:55 +0000 (20:17 +0000)]
am
246a68c4: am
1df6751d: am
b3f5d56f: am
5085447f: Merge "Don\'t install all host modules by default."
* commit '
246a68c47a8dbbce737ae3e7ca24d39b88e46863':
Don't install all host modules by default.
Ying Wang [Wed, 6 Mar 2013 20:16:30 +0000 (20:16 +0000)]
am
1df6751d: am
b3f5d56f: am
5085447f: Merge "Don\'t install all host modules by default."
* commit '
1df6751d494e3219dd5911c70d6696e12a30bcf4':
Don't install all host modules by default.
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.
Jeff Sharkey [Wed, 6 Mar 2013 19:52:30 +0000 (11:52 -0800)]
Add Terminal app to build.
Change-Id: Iec08640c5606907e00276694ccfadc654224c4c2
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 16:49:54 +0000 (16:49 +0000)]
am
7475afa6: am
42e05e04: Merge "remove reference of emulator vold.fstab which is no longer necessary" into jb-mr2-dev
* commit '
7475afa6991a93f66c45e98e11c408c601a48b7b':
remove reference of emulator vold.fstab which is no longer necessary
keunyoung [Wed, 6 Mar 2013 16:47:43 +0000 (16:47 +0000)]
am
42e05e04: Merge "remove reference of emulator vold.fstab which is no longer necessary" into jb-mr2-dev
* commit '
42e05e040e18367a4597564533c1af5642ebf79c':
remove reference of emulator vold.fstab which is no longer necessary
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 [Wed, 6 Mar 2013 00:40:08 +0000 (00:40 +0000)]
am
a67b5aee: am
c3eb68c4: pull goldfish specific stuffs from emulator.mk
* commit '
a67b5aeeb84d4fb368eea4e939cd5ecad1b12760':
pull goldfish specific stuffs from emulator.mk
keunyoung [Wed, 6 Mar 2013 00:37:29 +0000 (00:37 +0000)]
am
c3eb68c4: pull goldfish specific stuffs from emulator.mk
* commit '
c3eb68c4ba383e7de2dd9b761d96dbe646586845':
pull goldfish specific stuffs from emulator.mk
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) [Tue, 5 Mar 2013 21:08:09 +0000 (21:08 +0000)]
am
dce8cc7d: am
aace2024: Support build rules which generate .o files.
* commit '
dce8cc7dd5e5f83d97668a4afb13908c9983b982':
Support build rules which generate .o files.
Torne (Richard Coles) [Tue, 5 Mar 2013 21:04:53 +0000 (21:04 +0000)]
am
aace2024: Support build rules which generate .o files.
* commit '
aace2024d723f6914f05bd9d847166c45447a913':
Support build rules which generate .o files.
Dianne Hackborn [Tue, 5 Mar 2013 19:51:23 +0000 (19:51 +0000)]
Merge "Welcome, Key Lime Pie."
Dianne Hackborn [Tue, 5 Mar 2013 18:29:24 +0000 (10:29 -0800)]
Welcome, Key Lime Pie.
Change-Id: I51563ed3622d61a6396246c78b01605ff7a96b02
The Android Open Source Project [Tue, 5 Mar 2013 15:58:52 +0000 (15:58 +0000)]
am
1565e24a: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
1565e24a089290994afb23682e8fcaf436043e35':
JWQ64
The Android Open Source Project [Tue, 5 Mar 2013 15:53:09 +0000 (07:53 -0800)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I82507a8e1b352999d9e886071ed0297ca637b3b1
The Android Automerger [Tue, 5 Mar 2013 13:56:56 +0000 (05:56 -0800)]
JWQ64
The Android Automerger [Tue, 5 Mar 2013 13:55:17 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
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:13:47 +0000 (07:13 +0000)]
am
9a427c88: am
eabb34fb: Merge "Move emulator.mk out of full_base.mk" into jb-mr2-dev
* commit '
9a427c88cf1b26bfc7701dcbb3d708732f70b1e5':
Move emulator.mk out of full_base.mk
Ying Wang [Tue, 5 Mar 2013 07:11:28 +0000 (07:11 +0000)]
am
eabb34fb: Merge "Move emulator.mk out of full_base.mk" into jb-mr2-dev
* commit '
eabb34fb90712938449573962618f36c6df51e7c':
Move emulator.mk out of full_base.mk
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
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: I6f5f9255c73be8a4cfad7ddf88c4b633b05a7091
Ken Sumrall [Tue, 5 Mar 2013 03:19:02 +0000 (03:19 +0000)]
am
6d12cbc5: am
d5198cbc: Merge "Install a unified fstab in the emulator image" into jb-mr2-dev
* commit '
6d12cbc5bc8df4a86da262564a59985da97b9741':
Install a unified fstab in the emulator image
Ken Sumrall [Tue, 5 Mar 2013 03:17:39 +0000 (03:17 +0000)]
am
d5198cbc: Merge "Install a unified fstab in the emulator image" into jb-mr2-dev
* commit '
d5198cbccecfca083cc5df39e7fb3c0a64211e63':
Install a unified fstab in the emulator image
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 01:02:38 +0000 (01:02 +0000)]
am
dd66f462: (-s ours) am
69bb4e42: am
564c2b3e: Reconcile with jb-mr1.1-release - do not merge
* commit '
dd66f462fd65d3f4caccf3b54b1e3efd548feaf6':
JDQ39B
The Android Open Source Project [Tue, 5 Mar 2013 01:00:03 +0000 (01:00 +0000)]
am
69bb4e42: am
564c2b3e: Reconcile with jb-mr1.1-release - do not merge
* commit '
69bb4e42c58780b6b98cf8a20cac548474dfb6f9':
JDQ39B
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 Open Source Project [Mon, 4 Mar 2013 19:10:08 +0000 (19:10 +0000)]
am
0729ec54: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
0729ec54cdc856990366b401a117daec11c2dc97':
JWQ63
JWQ59D
JWQ59C
JWQ59B
JWQ59
JWQ58
JWQ57
JWQ56C
JWQ56B
JWQ56
JWQ52D
JWQ52C
JWQ52B
JWQ52
JWQ51C
JWQ51B
The Android Automerger [Mon, 4 Mar 2013 19:08:59 +0000 (11:08 -0800)]
JDQ39B
The Android Open Source Project [Mon, 4 Mar 2013 19:06:28 +0000 (11:06 -0800)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I0b8102a3962010378a8e19955a38c9cc44bd1c95
The Android Automerger [Mon, 4 Mar 2013 13:57:17 +0000 (05:57 -0800)]
JWQ63
The Android Automerger [Mon, 4 Mar 2013 13:55:11 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Sat, 2 Mar 2013 01:47:42 +0000 (01:47 +0000)]
am
0410d3ef: Merge "Allow to call dist-for-goals multiple times for the same file" into jb-mr2-dev
* commit '
0410d3ef3d9578177bffb06a657b1addab605167':
Allow to call dist-for-goals multiple times for the same file
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