Scott Main
589b4b3ea9
am 956d4c70
: am 373318ca
: am 0e69c3e4
: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
...
* commit '956d4c702bc71873db40829169556d75fc4aa75e':
2013-03-07 11:42:41 -08:00
Robert Ly
e28696da0a
am 116c59bb
: am cef5be2d
: am dae7b523
: Revert "support differently named lists.js files"
...
* commit '116c59bbb7220c64d362d55463083b51db2f687c':
2013-03-07 11:42:40 -08:00
Scott Main
40741e4898
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
2013-03-07 11:42:39 -08:00
Scott Main
3797ec576e
am 288099b2
: am a07be8ee
: switch code font to pure monospace (sans serif). also add proper margins for elements nested in lists
...
* commit '288099b27b17e057ffb954aae14f2cc7e7aab3fd':
2013-03-06 18:10:51 -08:00
Scott Main
5a0e36fe69
am 415696d3
: am f8333457
: Revert "docs: move loading of google ref into doc load event to prevent error during load"
...
* commit '415696d3f1a07b801fa7b0d73bb9e6040c5cedb4':
2013-03-06 18:10:50 -08:00
Scott Main
e99ca7ae6d
am 2990dc10
: am 578d6446
: docs: move loading of google ref into doc load event to prevent error during load
...
* commit '2990dc1076619ae890c4dd171b655bb88d4eee94':
2013-03-06 18:10:50 -08:00
Jean-Baptiste Queru
17cbfdda28
am 76bbd39a
: (-s ours) am 22c22cf7
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '76bbd39a91e87ab39ce866f3b8682a28729d16f2':
2013-03-06 18:10:49 -08:00
Scott Main
bfeae36ec4
am 68510e25
: am 9f2971d1
: docs: fix suggestions due to file name change for js files
...
* commit '68510e25089af27d680c88c5154d04ea7817ca01':
2013-03-06 18:10:49 -08:00
Scott Main
cdf32e8401
am e892c86e
: am 7e447edf
: docs: update search suggest with google services apis including some optimizations for loading javascript resources
...
* commit 'e892c86ef93cb96abf2b76e59bcaacd5a759f2f2':
2013-03-06 18:10:48 -08:00
Ken Sumrall
4c5b0bf4b8
am 8d3e1e55
: am 44281a1f
: Add unified fstab support to release tools
...
* commit '8d3e1e55737354ef05f23d225c61fc98472d61e7':
2013-03-06 18:10:48 -08:00
Scott Main
d3622632fa
am 8ced7e63
: am d6cb8fac
: docs: fix padding for left-figure class
...
* commit '8ced7e638c65268dfcde3dd8ca49dc0c573087cd':
2013-03-06 18:10:47 -08:00
Scott Main
956d4c702b
am 373318ca
: am 0e69c3e4
: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
...
* commit '373318caf6234dcb3c9f2f5a19bc8528980adcec':
2013-03-06 18:10:47 -08:00
Robert Ly
116c59bbb7
am cef5be2d
: am dae7b523
: Revert "support differently named lists.js files"
...
* commit 'cef5be2d834298d8f0e6099b59f347343eeafe91':
2013-03-06 18:10:46 -08:00
Scott Main
4cc2bc7763
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
2013-03-06 18:08:38 -08:00
Scott Main
288099b27b
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
2013-03-06 18:08:37 -08:00
Tim Murray
1a6f09a48c
Add support for multiple architectures with RS compat lib.
...
Change-Id: I310f6f72e1124c06e9c59b0f59d33f168dc1e632
2013-03-06 17:15:26 -08:00
Doug Zongker
e12973258a
recovery: choose between available fonts based on device density
...
Change-Id: I39aded4e1fb310d7e4b9c9ed3356686fcf62c002
2013-03-06 15:30:29 -08:00
Ying Wang
099ad657da
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.
2013-03-06 22:34:57 +00:00
Ying Wang
c36a4b6ea9
am 18be7ab2
: Merge "Stash TARGET_CPU_VARIANT and print it in dumpvar."
...
* commit '18be7ab2c982df72470f495d4458560538ba3114':
Stash TARGET_CPU_VARIANT and print it in dumpvar.
2013-03-06 14:32:05 -08:00
Ying Wang
18be7ab2c9
Merge "Stash TARGET_CPU_VARIANT and print it in dumpvar."
2013-03-06 21:55:33 +00:00
Ben Cheng
af21f7c3e7
Stash TARGET_CPU_VARIANT and print it in dumpvar.
...
Bug:7961327
Merged from internal master.
Change-Id: Ia78472ba53ae1221de4572119aa5c63246941eeb
2013-03-06 21:43:17 +00:00
Ying Wang
1df6751d49
am b3f5d56f
: am 5085447f
: Merge "Don\'t install all host modules by default."
...
* commit 'b3f5d56f65022ece632134a277c0610355272a04':
Don't install all host modules by default.
2013-03-06 20:13:29 +00:00
Scott Main
a07be8eee4
switch code font to pure monospace (sans serif).
...
also add proper margins for elements nested in lists
Change-Id: I1c2914904da63d21359283de945c9805f5d4af93
2013-03-06 12:12:21 -08:00
Ying Wang
b3f5d56f65
am 5085447f
: Merge "Don\'t install all host modules by default."
...
* commit '5085447f7f4c71e61c24f9d26df1e48a7a9d03ca':
Don't install all host modules by default.
2013-03-06 12:11:16 -08:00
Ying Wang
5085447f7f
Merge "Don't install all host modules by default."
2013-03-06 19:48:39 +00:00
Ying Wang
2e65cd5510
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
2013-03-06 11:47:36 -08:00
keunyoung
42e05e040e
Merge "remove reference of emulator vold.fstab which is no longer necessary" into jb-mr2-dev
2013-03-06 02:05:56 +00:00
keunyoung
d6e63b3ab5
remove reference of emulator vold.fstab which is no longer necessary
...
Change-Id: I2c8d28060e8204ecbe255cb1e2752e3030dc2d99
2013-03-05 17:44:10 -08:00
keunyoung
c3eb68c4ba
pull goldfish specific stuffs from emulator.mk
...
- init.goldfish.rc, init.goldfish.sh, and ueventd.goldfish.rc
Change-Id: Ia4a12477faf727c4e2276313d6d9dcf7ea430b22
2013-03-05 14:19:09 -08:00
Torne (Richard Coles)
aace2024d7
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
2013-03-05 10:35:57 +00:00
Ying Wang
eabb34fb90
Merge "Move emulator.mk out of full_base.mk" into jb-mr2-dev
2013-03-05 07:09:37 +00:00
Ying Wang
e8f5406582
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
2013-03-04 23:08:01 -08:00
Ken Sumrall
d5198cbcce
Merge "Install a unified fstab in the emulator image" into jb-mr2-dev
2013-03-05 03:14:27 +00:00
Ken Sumrall
f151d3718b
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
2013-03-04 18:30:52 -08:00
The Android Open Source Project
69bb4e42c5
am 564c2b3e
: Reconcile with jb-mr1.1-release - do not merge
...
* commit '564c2b3e4da71cfe4f1a0c8e15e2c9cec2415eea':
JDQ39B
2013-03-05 00:56:08 +00:00
The Android Open Source Project
564c2b3e4d
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Ic2017881546bd6488432b9a87196f1c8eb6e5819
2013-03-04 11:14:54 -08:00
The Android Automerger
1c2fa25b71
JDQ39B
2013-03-04 11:08:59 -08:00
Ying Wang
0410d3ef3d
Merge "Allow to call dist-for-goals multiple times for the same file" into jb-mr2-dev
2013-03-02 01:43:28 +00:00
Ying Wang
534fcd766e
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
2013-03-01 16:51:26 -08:00
Dave Langemak
d8eb27bf6a
Add pseudolanguage codes to l10n builds
...
bug: 8299925
Change-Id: Id4bab811bc3f6660f4ce0a21afb689366d80d795
2013-03-01 14:16:29 -08:00
Ying Wang
962d06ef65
Add module names to emulator PRODUCT_PACKAGES.
...
Instead of using "LOCAL_MODULE_TAGS := debug" to install them.
Bug: 8276818
Change-Id: I7eba3c4e6c2f07ebe661522cb0e14afcc3ef7e92
2013-02-28 16:45:41 -08:00
Kenny Root
3e3a3a2b79
am 14567bb0
: am 08d56b4a
: Merge "CTS: work around ClassLoader limitation"
...
* commit '14567bb00754405fac535bc8be8e46fa8abd7c82':
CTS: work around ClassLoader limitation
2013-02-28 17:48:59 +00:00
Kenny Root
14567bb007
am 08d56b4a
: Merge "CTS: work around ClassLoader limitation"
...
* commit '08d56b4a1049fe4b4d3a01e2087f371fdeefaf84':
CTS: work around ClassLoader limitation
2013-02-28 09:47:35 -08:00
Kenny Root
08d56b4a10
Merge "CTS: work around ClassLoader limitation"
2013-02-28 17:23:55 +00:00
Kenny Root
65307c065f
CTS: work around ClassLoader limitation
...
Trying to use reflection on classes loaded from a different ClassLoader
than the system one caused SecurityException since you can't load
certain packages.
Adding them to the boot classpath forces them to be in the same
ClassLoader.
Change-Id: Id518ab0a99da6defac525c0ad430a63f600ce85f
2013-02-27 16:56:04 -08:00
Ying Wang
6f05aa44ec
Merge "Run e2fsck only when building images with the target files." into jb-mr2-dev
2013-02-28 00:46:07 +00:00
Ken Sumrall
e4a045e9e6
Install a unified fstab for the sdk image
...
Change-Id: I95ed5ee83783dfce110c1f07b187d4624be9a735
2013-02-27 16:20:56 -08:00
Ying Wang
45150f8b89
Fix function call syntax error.
...
Change-Id: Id40e059ade0c24b62ac407192ed3a67398dfa083
2013-02-27 15:23:42 -08:00
Ying Wang
4974879c32
Merge "Switch target java library dependency file from javalib.jar to classes.jar" into jb-mr2-dev
2013-02-27 23:10:12 +00:00
Ying Wang
6a42a25429
Run e2fsck only when building images with the target files.
...
With this change, e2fsck is run only when you build the update.zip file,
which is built when "dist" is among the make command.
Bug: 7591683
Change-Id: I446b71d5aa9295aff3af622f115175f769746615
2013-02-27 13:54:02 -08:00