smain@google.com
dd5adb3bc0
am 05e55e90
: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs
...
automerge: d1ab4cb
* commit 'd1ab4cb3b4ca8de66a873abb072bd73556926d4d':
add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
2014-10-28 23:26:41 +00:00
Adam Lesinski
708e021a31
Merge "Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings" into lmp-mr1-dev
2014-10-28 17:41:30 +00:00
Ying Wang
a73b611e6b
Store symbols.zip in apps_only build.
...
automerge: a60fb49
* commit 'a60fb49704946b9d5cf0551ddd56bd1072131b85':
Store symbols.zip in apps_only build.
2014-10-28 00:15:59 +00:00
Adam Lesinski
b4efae440b
Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings
...
It's better practice to include the minimal set of windows APIs anyways
and we're not doing anything that requires more.
Change-Id: I1b4362be4f707738b9cfbd6a87caabff8b8409ac
2014-10-27 14:26:35 -07:00
Ying Wang
a60fb49704
Store symbols.zip in apps_only build.
...
Bug: 18103055
Change-Id: I0eb335e944138b0edc3050d19c076891f499a07c
2014-10-27 17:57:11 +00:00
JP Abgrall
620e409127
am 775b1abb
: core: Fixup bad ext4 mount options for recovery (pick common denominator)
...
* commit '775b1abb12a5d891ac66b51d28381692bde6ab03':
core: Fixup bad ext4 mount options for recovery (pick common denominator)
2014-10-24 02:57:34 +00:00
JP Abgrall
775b1abb12
core: Fixup bad ext4 mount options for recovery (pick common denominator)
...
Some ext4 options were not suitable for all kernel versions.
The current option were checked against kernels 3.0 3.4 3.10.
Bug: 18092222
Change-Id: I30883706e5c8ac7a318f4b448d4becde50de808f
2014-10-23 16:27:03 -07:00
Michael Runge
46fe30eff7
am fb8886db
: get_stage in updater takes one param, not two.
...
* commit 'fb8886db6858388af5082268fd023b8a44fb87ea':
get_stage in updater takes one param, not two.
2014-10-23 21:57:12 +00:00
JP Abgrall
4f072e140b
am 7bd80ca6
: Merge "core: Let the build specify mount options for recovery" into lmp-dev
...
* commit '7bd80ca6ea2b0c5c39bdb05013fb3d0188fbcfa8':
core: Let the build specify mount options for recovery
2014-10-23 21:57:11 +00:00
Michael Runge
10ba565431
am 7cd99bad
: Allow info_dict from target_files to specify mount options
...
* commit '7cd99bad210455dc57702b7cbf674a588a5eb028':
Allow info_dict from target_files to specify mount options
2014-10-23 21:57:10 +00:00
Michael Runge
fb8886db68
get_stage in updater takes one param, not two.
...
Change-Id: I09a77eda5a1691080b1ae074d2e94d233eca7150
2014-10-23 13:51:04 -07:00
Jeff Hamilton
5069bd6bfa
Add a density axis to tapas.
...
It allows overriding the density the app
is built for. Currently only used in the
GMS core APK's gradle file.
Change-Id: I3606df313a3110208cd8e6acade5f558261c921f
(cherry picked from commit 7e3d2341570681e566872216796dc4f79c8695ef)
2014-10-23 18:30:01 +00:00
JP Abgrall
7bd80ca6ea
Merge "core: Let the build specify mount options for recovery" into lmp-dev
2014-10-23 18:15:57 +00:00
JP Abgrall
6ea5bd626c
core: Let the build specify mount options for recovery
...
Currently recovery install/patch will mount /system++ with only default
options.
The default options are not very suitable for dealing with crashes.
We now use
TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS
that can specify which mount options to use for a given fs-type.
# <fstype>=<fstype_opts>[|<fstype_opts>]...
# fstype_opts := <opt>[,<opt>]...
# opt := <name>[=<value>]
If only defaults are to be used, then the BoardConfig.mk can just have
an empty (must have ""):
TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS := ""
The default is
"ext4=match_batch_time=0,commit=1,data=journal,barrier=1,errors=panic,nodelalloc"
The release tools will pick them up with
https://googleplex-android-review.git.corp.google.com/#/c/573628
Bug: 18092222
Change-Id: Iaa59099b0edf5af8835d1862fada089cff58882c
2014-10-23 17:54:01 +00:00
smain@google.com
60e80ef6e7
am f84e045e
: Merge "add helpouts script to <head>, behind a condition that can be enabled per page" into lmp-dev
...
* commit 'f84e045e42f0377c415b2b6fea432ea0f3967f4f':
add helpouts script to <head>, behind a condition that can be enabled per page
2014-10-23 16:34:39 +00:00
Michael Runge
7cd99bad21
Allow info_dict from target_files to specify mount options
...
This will allow safer mount options to be added per mount FS
type, to better ensure data is written during an OTA.
Bug: 18079773, 18092222
Change-Id: I1e3e4fd4639c6fd263e550b770cc3c858ef1e03b
2014-10-22 18:38:49 -07:00
Ying Wang
9318a22f96
am b6f60d57
: Use the lowest common denominator 32-bit abi for arm64 cts build.
...
* commit 'b6f60d57e3e5ccb89145cd2513a9a35077c025a5':
Use the lowest common denominator 32-bit abi for arm64 cts build.
2014-10-23 00:14:19 +00:00
smain@google.com
f84e045e42
Merge "add helpouts script to <head>, behind a condition that can be enabled per page" into lmp-dev
2014-10-22 23:58:07 +00:00
Ying Wang
e3fe9cf213
am 03eceba1
: Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
...
* commit '03eceba1ddfe6cf3ae6eb22bddc889930c097c1a':
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
2014-10-22 20:47:46 +00:00
smain@google.com
8df21b19c4
add helpouts script to <head>, behind a condition that can be enabled per page
...
Change-Id: Ifa2364ed77a86efd6bec69dbe4f15d7f69569504
2014-10-22 09:55:04 -07:00
Clay Murphy
238964e1e2
am f7b231b7
: Docs: Making source.android.com headers match those of developer.android.com
...
* commit 'f7b231b7a64c2ab953c9f4a2eb5390f0b3a2f296':
Docs: Making source.android.com headers match those of developer.android.com
2014-10-22 14:53:29 +00:00
Ying Wang
b6f60d57e3
Use the lowest common denominator 32-bit abi for arm64 cts build.
...
So the 32-bit code can be run any supported 32-bit arm devices.
Bug: 18038310
Change-Id: Ie8864cfdb87a4759d1a775d43cb5316b1f022e2b
2014-10-21 21:20:41 -07:00
Ying Wang
03eceba1dd
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
...
Change-Id: I9182ce1efe09609100d19c9fae2bc4fe7358dfc0
2014-10-21 18:34:30 -07:00
Clay Murphy
f7b231b7a6
Docs: Making source.android.com headers match those of developer.android.com
...
Bug: 17814801
Change-Id: I128a76b32b0d92118f621062c62d72460313f4d6
2014-10-21 10:25:35 -07:00
Adam Lesinski
ea24f79479
am 318217a8
: Enable building of gtest for Windows
...
* commit '318217a84a05880f5e10ba2086f87eb0320772c7':
Enable building of gtest for Windows
2014-10-21 16:40:56 +00:00
Naseer Ahmed
3a2b9f0a49
core: OSX: Support 10.9 SDK as well
...
Change-Id: I764102df9b84ca19d217e35a209a9c80abeed6e7
2014-10-20 17:34:49 -07:00
Adam Lesinski
318217a84a
Enable building of gtest for Windows
...
Windows does not have pthread support, and by defining the
GTEST_OS_WINDOWS flag, pthread support will not be built into
the windows version of gtest.
Change-Id: I0571fc52e77bb04175470d5750a7e2f46cdd5e86
2014-10-20 16:06:44 -07:00
Clay Murphy
597bfe1e0b
am 327180f5
: Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev
...
* commit '327180f5d2009be990076f152dffb244939b1673':
Docs: Fixing link, adding Android Partner logo.
2014-10-17 20:01:06 +00:00
Clay Murphy
327180f5d2
Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev
2014-10-17 19:47:51 +00:00
smain@google.com
bd78b888a5
am be113f8a
: fix broken download buttons, make a[name] offset apply only to reference docs
...
* commit 'be113f8ac0f5ae00fa997db5f4507af55c523367':
fix broken download buttons, make a[name] offset apply only to reference docs
2014-10-17 18:53:32 +00:00
smain@google.com
fc3f1719b4
am 947f3e9e
: Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev
...
* commit '947f3e9ecf9bc7875d210a45053826eb0e110186':
fix z-order of hangouts to avoid clobbering the search suggest
2014-10-17 18:52:43 +00:00
Joe Fernandez
d804dac5d8
am e321df0c
: Merge "Doc change: update query params to force refresh of local js files." into lmp-dev
...
* commit 'e321df0ca2eaada3e126393a7976cd4cc09afdf6':
Doc change: update query params to force refresh of local js files.
2014-10-17 18:50:48 +00:00
smain@google.com
7f37fba645
am 19c6780f
: Merge "fix scroll offset when loading non-header pages" into lmp-dev
...
* commit '19c6780f9fc4994c0909afa900e59b9282a0d253':
fix scroll offset when loading non-header pages
2014-10-17 18:50:47 +00:00
David Friedman
a342728747
am e0471a82
: Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
...
* commit 'e0471a82276d86c671a9e2a21f58eb140cb94dc0':
Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
2014-10-17 18:50:46 +00:00
Dianne Hackborn
374712c54f
Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-dev
2014-10-17 17:12:11 +00:00
Dianne Hackborn
4a6a7524b3
Move up to API 21, Lollipop MR1.
...
Change-Id: I81c3455d99673447ac0bc1b48d5ab1500b2bfd20
2014-10-17 10:05:33 -07:00
smain@google.com
be113f8ac0
fix broken download buttons, make a[name] offset apply only to reference docs
...
Change-Id: I44421d90c335e0fcb4b35d8f568f9775a84b41ea
2014-10-17 09:56:10 -07:00
smain@google.com
947f3e9ecf
Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev
2014-10-17 08:27:18 +00:00
smain@google.com
77cf43e739
fix z-order of hangouts to avoid clobbering the search suggest
...
Change-Id: I3993a118a1c7eb33ecc661635b1e9db2416bdf73
2014-10-17 01:21:13 -07:00
Joe Fernandez
e321df0ca2
Merge "Doc change: update query params to force refresh of local js files." into lmp-dev
2014-10-17 05:41:07 +00:00
smain@google.com
19c6780f9f
Merge "fix scroll offset when loading non-header pages" into lmp-dev
2014-10-17 05:18:08 +00:00
smain@google.com
11fc009469
fix scroll offset when loading non-header pages
...
Change-Id: I7a90ccf760eb06c291e88a3ace04c8c7498f75c1
2014-10-16 22:10:00 -07:00
Clay Murphy
06dbd2655c
Docs: Fixing link, adding Android Partner logo.
...
Bug: 17998826
Change-Id: Ia6b46d8230e5c9041b732e481fd5fcb546d2099d
2014-10-16 18:23:58 -07:00
David Friedman
e0471a8227
Changes to NDK download table format to reflect change in download structure
...
Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
Change-Id: Id19f095c506bab62a3be23a1cb0d1bf30369c54d
2014-10-16 12:14:04 -07:00
smain@google.com
8e8b871cd6
am f0d8234b
: Merge "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" into lmp-dev
...
* commit 'f0d8234ba94bac48d0f5848ff9a15d2cd9bcef6b':
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
2014-10-16 18:35:37 +00:00
Dirk Dougherty
88c15600b8
Doc change: update query params to force refresh of local js files.
...
Change-Id: I217b5b80e39452412816907d55dee23a5176b287
2014-10-16 10:28:52 -07:00
smain@google.com
f0d8234ba9
Merge "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" into lmp-dev
2014-10-16 16:32:38 +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