Conley Owens
569820b40d
am 21f527be: am c70ae578: Merge "Docs: Replacing s.a.c. Android logo to match other sites." into lmp-dev
...
* commit '21f527bed81ecfe7b90098edb7076983d118099d':
Docs: Replacing s.a.c. Android logo to match other sites.
2014-10-16 07:00:26 +00:00
Michael Runge
1eb7a595ab
am 92946baa: am 9d641c41: Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev
...
* commit '92946baa035ee9376478185fbd74849730d20768':
Fix public/private key options on sign_target_files_apks
2014-10-16 07:00:25 +00:00
smain@google.com
bfcef089ac
am 5bf3bb5a: am c69af6fa: hide the butter bar but also update the CSS for recent butterbar changes
...
* commit '5bf3bb5ab8be76972bce3f679631869e67185295':
hide the butter bar but also update the CSS for recent butterbar changes
2014-10-16 07:00:24 +00:00
Doug Zongker
641bfeddf3
am e18eb508: add support for the \'fill\' chunk type to sparse_img
...
* commit 'e18eb50850201e573084a0cd8e1199d877170b64':
add support for the 'fill' chunk type to sparse_img
2014-10-16 05:52:53 +00:00
Conley Owens
21f527bed8
am c70ae578: Merge "Docs: Replacing s.a.c. Android logo to match other sites." into lmp-dev
...
* commit 'c70ae578118573ec2073012ab57f0307184f74a3':
Docs: Replacing s.a.c. Android logo to match other sites.
2014-10-16 05:52:17 +00:00
Michael Runge
92946baa03
am 9d641c41: Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev
...
* commit '9d641c41db732c4e9e7a5dac074197f1a9d40bcc':
Fix public/private key options on sign_target_files_apks
2014-10-16 05:52:17 +00:00
smain@google.com
5bf3bb5ab8
am c69af6fa: hide the butter bar but also update the CSS for recent butterbar changes
...
* commit 'c69af6faebbc2546aebee2c5d08eedb28f2b52ee':
hide the butter bar but also update the CSS for recent butterbar changes
2014-10-16 05:52:16 +00:00
Doug Zongker
b883acc21c
am e18eb508: add support for the \'fill\' chunk type to sparse_img
...
* commit 'e18eb50850201e573084a0cd8e1199d877170b64':
add support for the 'fill' chunk type to sparse_img
2014-10-15 23:59:03 +00:00
Conley Owens
f6b538e56c
am c70ae578: Merge "Docs: Replacing s.a.c. Android logo to match other sites." into lmp-dev
...
* commit 'c70ae578118573ec2073012ab57f0307184f74a3':
Docs: Replacing s.a.c. Android logo to match other sites.
2014-10-15 23:58:13 +00:00
Michael Runge
a64ce997e2
am 9d641c41: Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev
...
* commit '9d641c41db732c4e9e7a5dac074197f1a9d40bcc':
Fix public/private key options on sign_target_files_apks
2014-10-15 23:57:24 +00:00
smain@google.com
3852f80d39
am c69af6fa: hide the butter bar but also update the CSS for recent butterbar changes
...
* commit 'c69af6faebbc2546aebee2c5d08eedb28f2b52ee':
hide the butter bar but also update the CSS for recent butterbar changes
2014-10-15 23:57:18 +00:00
smain@google.com
afb1fccfbb
am e87bd05e: am 820e226d: am d1ab4cb3: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
...
* commit 'e87bd05ecf8633c99f859a898f9a46a2a5c26e4b':
add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
2014-10-15 23:57:09 +00:00
Doug Zongker
e18eb50850
add support for the 'fill' chunk type to sparse_img
...
Bug: 17987996
Change-Id: Ia661e87877e52274a991ceb77bbed93b7e6218f2
(cherry picked from commit 629c7cc84d
)
2014-10-15 23:38:34 +00:00
smain@google.com
e87bd05ecf
am 820e226d: am d1ab4cb3: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
...
* commit '820e226d5dc63589dec0263d3639526addb5dbaa':
add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
2014-10-15 23:24:55 +00:00
Ian Rogers
63e551f0ae
Move definition of -D__ARM_FEATURE_LPAE=1 cflag to top-level.
...
LPAE indicates better instructions can be used when atomicity guarantees are
needed. However, LPAE's presence isn't advertised by clang/GCC. We fake an
ARM feature to advertise its presence on architectures where it is.
Also, add a TODO documenting that cortex-a15 is not the correct CPU variant
for krait.
Change-Id: I02a1248025c32d94eca0bc8a249dc524f1ac9c36
2014-10-15 15:44:16 -07:00
Conley Owens
c70ae57811
Merge "Docs: Replacing s.a.c. Android logo to match other sites." into lmp-dev
2014-10-15 21:27:14 +00:00
Clay Murphy
412a13217b
Docs: Replacing s.a.c. Android logo to match other sites.
...
Bug: 15408415
Change-Id: I9bdb294f3ff0c5aaf766b4ead79ad9614f9dbd89
2014-10-15 14:09:09 -07:00
smain@google.com
fbdb2a1b62
add helpouts banner thing to recruit providers
...
includes script to randomly change the URL and text of link as an A/B test
it's a bad A/B test because it does not save the A/B per session
Change-Id: Ie8338a7403834d2322c5088039f2936207db734b
2014-10-15 13:05:21 -07:00
Michael Runge
9d641c41db
Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev
2014-10-15 19:54:22 +00:00
smain@google.com
c69af6faeb
hide the butter bar but also update the CSS for recent butterbar changes
...
Change-Id: I29cbdfe4ef6542a0dd04642be76856f3af2732d1
2014-10-15 12:48:58 -07:00
smain@google.com
093283a070
am 820e226d: am d1ab4cb3: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
...
* commit '820e226d5dc63589dec0263d3639526addb5dbaa':
add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
2014-10-15 19:17:43 +00:00
smain@google.com
820e226d5d
am d1ab4cb3: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
...
* commit 'd1ab4cb3b4ca8de66a873abb072bd73556926d4d':
add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
2014-10-15 19:11:38 +00:00
Michael Runge
947894f87e
Fix public/private key options on sign_target_files_apks
...
The if statements appear to check for public_signing
and then calls the private_signing function, and vice
versa.
Change-Id: I4511b9bcf0e03b9ba49b69eb80db84cf31d77020
2014-10-14 20:58:38 -07:00
Stuart Scott
ff8f66dcc8
am 3c0190ff: am f06c6eff: Add abi to generated XML
...
* commit '3c0190ff5bc74ba7102691b3e2db3c867a2e2442':
Add abi to generated XML
2014-10-15 02:30:59 +00:00
smain@google.com
d1ab4cb3b4
am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
...
* commit '05e55e9009435072ac25d2ce487d47b6c4f8a60b':
add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
2014-10-15 02:15:31 +00:00
smain@google.com
05e55e9009
Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
2014-10-15 02:08:51 +00:00
smain@google.com
ee5b3b10de
add butterbar for L announcement.
...
make the butterbar an encapsulated method for inclusion multiple places.
Change-Id: I7716bd293372dcf88cd0bd57fb399d01bfa897a0
2014-10-14 18:47:36 -07:00
Stuart Scott
3c0190ff5b
am f06c6eff: Add abi to generated XML
...
* commit 'f06c6eff656f6bf0ac06662ef21e29e446e1a43d':
Add abi to generated XML
2014-10-15 00:22:35 +00:00
Dan Albert
b0d324aadd
Merge "resolved conflicts for merge of 852fc3e6
to lmp-dev-plus-aosp" into lmp-dev-plus-aosp
2014-10-15 00:19:06 +00:00
Stuart Scott
3e65583ef7
am f06c6eff: Add abi to generated XML
...
* commit 'f06c6eff656f6bf0ac06662ef21e29e446e1a43d':
Add abi to generated XML
2014-10-15 00:18:37 +00:00
Dan Albert
a8abcb365b
resolved conflicts for merge of 852fc3e6
to lmp-mr1-dev-plus-aosp
...
Change-Id: I9809c14b2f9ffb539272aba66d3a27d8107b81ea
2014-10-14 17:17:22 -07:00
Dan Albert
ae66eba6f3
resolved conflicts for merge of 852fc3e6
to lmp-dev-plus-aosp
...
Change-Id: If3de742dcd2157c4690ae0eb34494dc11492054f
2014-10-14 17:15:17 -07:00
Stuart Scott
f06c6eff65
Add abi to generated XML
...
bug:17881028
Change-Id: I6dd37e99c0f511d8c883cb8128ea743c2e21f6ad
2014-10-15 00:10:08 +00:00
Dan Albert
852fc3e69c
am c131ec09: Merge "Link compiler-rt in the correct order."
...
* commit 'c131ec09d9ffb92473c4162c92c0646d6e731b0c':
Link compiler-rt in the correct order.
2014-10-15 00:05:35 +00:00
Dan Albert
c131ec09d9
Merge "Link compiler-rt in the correct order."
2014-10-14 23:59:27 +00:00
Dan Albert
e1b17e7ef5
Link compiler-rt in the correct order.
...
The compiler run-time library should always be the _last_ thing linked
when building static executables. This was being done correctly for
libgcc, but not when using compiler-rt.
Change-Id: I0689dc35f55caad2fe74c0cbb4cbe3008ded349a
2014-10-14 10:45:33 -07:00
Elliott Hughes
9b5e64a808
am 33f33371: am 165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds."
...
* commit '33f33371cdef7d8faa9f39cd4902698856c0bb64':
Remove "-mstackrealign" option from all x86 builds.
2014-10-13 22:45:43 +00:00
Elliott Hughes
337dd2e637
am 33f33371: am 165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds."
...
* commit '33f33371cdef7d8faa9f39cd4902698856c0bb64':
Remove "-mstackrealign" option from all x86 builds.
2014-10-13 22:45:42 +00:00
Elliott Hughes
33f33371cd
am 165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds."
...
* commit '165fdf42042d7c13d9f7866b3a3eff841e08dad2':
Remove "-mstackrealign" option from all x86 builds.
2014-10-13 22:41:47 +00:00
Elliott Hughes
165fdf4204
Merge "Remove "-mstackrealign" option from all x86 builds."
2014-10-13 22:35:59 +00:00
Alexander Ivchenko
ae2d47a47f
Remove "-mstackrealign" option from all x86 builds.
...
For ndk docs change, please refer to:
https://android-review.googlesource.com/#/c/110100/
Change-Id: I8428e7a979eb02441066aeeee43ce693d4d0dc8d
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
2014-10-13 19:08:01 +04:00
Alan Viverette
63cea7b230
am a6f16533: am 4543ae81: Merge "Add Cutive Mono to makefiles" into lmp-dev
...
* commit 'a6f16533e23aa287bbeddb025d1166d3f35f1563':
Add Cutive Mono to makefiles
2014-10-11 04:55:33 +00:00
Alan Viverette
a6f16533e2
am 4543ae81: Merge "Add Cutive Mono to makefiles" into lmp-dev
...
* commit '4543ae819da023b8d51f36497c6e5445a51b70ba':
Add Cutive Mono to makefiles
2014-10-11 02:49:49 +00:00
Alan Viverette
1dc5b58689
am 4543ae81: Merge "Add Cutive Mono to makefiles" into lmp-dev
...
* commit '4543ae819da023b8d51f36497c6e5445a51b70ba':
Add Cutive Mono to makefiles
2014-10-10 23:46:06 +00:00
Alan Viverette
4543ae819d
Merge "Add Cutive Mono to makefiles" into lmp-dev
2014-10-10 23:41:20 +00:00
Alan Viverette
6444212890
Add Cutive Mono to makefiles
...
BUG: 17666124
Change-Id: I73aee6b7a211bfbd0bdba9c6c630c4c5dea905c7
2014-10-10 19:53:44 +00:00
smain@google.com
ddb60cbbc3
am a8752f9d: am f0daf562: Merge "fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there\'s no searchbar on the page" into lmp-dev
...
* commit 'a8752f9defb075c079a73d21bc9e99da26c5a3c9':
fix bug causing anchors to fail on preview landing page; exit the onhashchange listener if there's no searchbar on the page
2014-10-10 17:16:09 +00:00
smain@google.com
fbb9958f11
am e425f9bf: am 17e2c06e: make the <a> tag offset effective for the whole site, not just reference, because turns out these are also used in the manifest docs, so what the heck.
...
* commit 'e425f9bfddb7a395e6659c1ca1e312583fb314a6':
make the <a> tag offset effective for the whole site, not just reference, because turns out these are also used in the manifest docs, so what the heck.
2014-10-10 17:16:08 +00:00
Raphael Moll
f70f3673d5
am 5abf8bf2: am a4d1f6a7: SDK Addon multi-sys-img support.
...
* commit '5abf8bf25743ed95f9a3bb6bf4702d2042667c59':
SDK Addon multi-sys-img support.
2014-10-10 17:16:08 +00:00
Ying Wang
e2331e9f2c
am 36cff2a9: am edb9df24: Merge "Check to determine if we can run dex-preopt." into lmp-dev
...
* commit '36cff2a9963d593da831684b5cfbb9ce73dd9c27':
Check $(built_dex) to determine if we can run dex-preopt.
2014-10-10 16:58:03 +00:00