Ying Wang
4fc1467949
am fc168f84: resolved conflicts for merge of 1a8c6567
to lmp-mr1-ub-dev
...
* commit 'fc168f84695f492f2ad0eed3063145f425bebf45':
Don't fail build of otatools if there are no device certificates
2015-08-27 01:33:15 +00:00
Ying Wang
8f7c08ed62
am 1e120181: am 473b6a5f: am fc028e59: Dist the otatools package.
...
* commit '1e120181f0a9240eca61dface4fb4530bf2594ab':
Dist the otatools package.
2015-08-27 01:27:37 +00:00
Ying Wang
fc168f8469
resolved conflicts for merge of 1a8c6567
to lmp-mr1-ub-dev
...
Change-Id: Iadb7c55c246705ac10c6822b7bb5d71794ce485b
2015-08-26 17:03:18 -07:00
Ying Wang
1e120181f0
am 473b6a5f: am fc028e59: Dist the otatools package.
...
* commit '473b6a5f2b00f941acb08b5c3df59cbbdf647609':
Dist the otatools package.
2015-08-26 20:17:16 +00:00
Claes Elgemark
1a8c656704
am 8d771971: Don\'t fail build of otatools if there are no device certificates
...
* commit '8d771971212069f77851163f437c782f581bf6db':
Don't fail build of otatools if there are no device certificates
2015-08-26 17:14:49 +00:00
Claes Elgemark
8d77197121
Don't fail build of otatools if there are no device certificates
...
Bug: 23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
2015-08-26 10:07:16 -07:00
Bart Sears
c69aa42b43
Merge "Set the Security Patch level for MNC" into mnc-dev
2015-08-26 03:40:38 +00:00
Tao Bao
afc5ab39d8
am c6e087ad: resolved conflicts for merge of 2bcfbe7e
to lmp-mr1-ub-dev
...
* commit 'c6e087adc420ca08bfea8613c07aa51e1b4a2e3e':
add otatools-package target
2015-08-25 23:30:14 +00:00
Tao Bao
c6e087adc4
resolved conflicts for merge of 2bcfbe7e
to lmp-mr1-ub-dev
...
Change-Id: Ia53581aee207b0a24807767d7e80959a4fc9aff3
2015-08-25 16:18:01 -07:00
Konstantinos Menychtas
ca19158e03
am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6
to lmp-mr1-ub-dev
...
* commit 'e9a8f465859137ba37786031b804864205900cb4':
Increasing all emulator system image sizes
2015-08-25 18:22:28 +00:00
Ying Wang
473b6a5f2b
am fc028e59: Dist the otatools package.
...
* commit 'fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd':
Dist the otatools package.
2015-08-25 18:21:13 +00:00
Ying Wang
fc028e59c2
Dist the otatools package.
...
Bug: 23495952
(cherry picked from commit 267e957373
)
Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
2015-08-25 11:13:56 -07:00
Konstantinos Menychtas
e9a8f46585
resolved conflicts for merge of 0287a8f6
to lmp-mr1-ub-dev
...
Change-Id: I1c5e60988d95e8ee73fb4cee632750ecb69b81f5
2015-08-25 17:26:22 +00:00
Bart Sears
0bb3145b56
Set the Security Patch level for MNC
...
MNC will include the security patches from the August OEM bulletin
which will have a patch date of September 1.
Bug: 23288951
Change-Id: Ia0f313bf35fa7af1efed1787006bfbb614bc8c29
2015-08-24 23:22:20 -07:00
Doug Zongker
2bcfbe7e88
am 32bf3f32: add otatools-package target
...
* commit '32bf3f32651ddff9ffa2168017d71ec4b151a0a9':
add otatools-package target
2015-08-25 01:20:34 +00:00
Doug Zongker
32bf3f3265
add otatools-package target
...
Add a target to zip up all the otatools and releasetools, for easy
copying to the OTA builder machine.
Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563
(cherry picked from commit f22b0f43ef
)
2015-08-24 15:43:40 -07:00
smain@google.com
ed7e864a73
fix a few bugs in the studio download button behavior:
...
- make button text always white (avoid blue on blue during hover)
- revise logic to add the platform name to download button to avoid weird duplicity bug on small screens
- remove the animation script when clicking download before agree because it reloaded the page (unkown cause)
depends on: https://googleplex-android-review.git.corp.google.com/#/c/752757/
Change-Id: I1b2b4ff9c0b0cbbd34f1c77a2b736fe3425a16e4
2015-08-20 00:52:27 +00:00
Konstantinos Menychtas
0287a8f6c5
am dae79613: Increasing all emulator system image sizes
...
* commit 'dae79613cb4deb209d3428b108535715aa364f68':
Increasing all emulator system image sizes
2015-08-18 20:19:10 +00:00
Konstantinos Menychtas
dae79613cb
Increasing all emulator system image sizes
...
Size increase in system image deemed necessary after build
breakage observed on lmp-mr1-dev due to lack of space on
MIPS system image.
All system image sizes updated to match the image size
values set in MNC-dev (avoid merge conflicts, future-proof
all images against similar breakage issues).
This image size increase takes moderate space on host
device and does not affect system image download size
(images are sparse but delivered compressed anyway).
Change-Id: I2bdeb10f2d98030a358a9bc4249ce23c432de5bd
2015-08-18 11:18:59 -07:00
Konstantinos Menychtas
956e469327
Increasing MIPS emulator system image size and user-data image size
...
Size increase taken as a precaution against recent built breakage
due to lack of space on a number of targets (e.g. x86, ARM64).
System and user-data image sizes set to match currently most common
setup for the emulator: system image: 1.25gb, user-data image 700mb.
Change-Id: I7118eb26dd78f5fa9e4f0006e15c8d47dee8e28c
2015-08-18 17:34:09 +00:00
Dirk Dougherty
6a8f88cdec
adjust image placement for m hero on medium screens.
...
Change-Id: I644837bf151549ad8dbbfb194f8e699233362933
2015-08-14 21:19:22 -07:00
Joe Fernandez
71e0a80c2c
Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
2015-08-13 23:02:37 +00:00
Dirk Dougherty
083da20347
doc change: Add hero image for m and css for landing pages.
...
Change-Id: I52ddba716eebf821f8f5dbd888d6e3519f4284d4
2015-08-13 12:37:34 -07:00
Chris Banes
743938fb0d
Merge "Make sure only AppCompat (not it's tests) are in the docs" into mnc-dev
2015-08-13 17:28:32 +00:00
Mike Dodd
5bf35d0685
Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
2015-08-13 15:16:38 +00:00
Chris Banes
b916a5bcbc
Make sure only AppCompat (not it's tests) are in the docs
...
BUG: 23169683
Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
2015-08-13 10:42:02 +01:00
Dianne Hackborn
25abc5a38e
Merge "Fix issie #23116383 : Include security patch level in Settings" into mnc-dev
2015-08-13 00:46:58 +00:00
Dianne Hackborn
e593e5c42a
Fix issie #23116383 : Include security patch level in Settings
...
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
2015-08-12 16:29:08 -07:00
Mike Dodd
f29b5bd380
Include new AOSP messaging app in base AOSP telephony builds.
...
b/23110861
Change-Id: I31ba32f3341c77ba6eb083a189dffa1a08c6c8d4
2015-08-12 15:44:04 -07:00
Ian Pedowitz
a0372e20a2
Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
2015-08-12 19:41:54 +00:00
Mike Dodd
745d11ccd0
Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
2015-08-12 18:53:47 +00:00
Mike Dodd
018500efea
Revert "Include new AOSP messaging app in base builds."
...
This reverts commit a8b0905e16
.
Change-Id: Ia8b8eaf6576937907b073ad97593440e114c0b6f
2015-08-12 18:48:45 +00:00
Ian Pedowitz
68c62e78ad
Removing VisualizationWallpapers as it does not comply with API 23 rules
...
Bug: 23021372
Change-Id: Ib985ac99bd9068c21f8a1c48e77c72426f69ea79
2015-08-12 11:11:55 -07:00
Mike Dodd
02389bf940
Merge "Include new AOSP messaging app in base builds." into mnc-dev
2015-08-12 17:01:24 +00:00
Tao Bao
11cf92aa37
am 1dca55fd: skip the merge of 67e7c661
to lmp-mr1-ub-dev
...
* commit '1dca55fde512f1758690fb563f1ffc9cec5f7271':
Add support for clobbered blocks
2015-08-12 06:55:21 +00:00
Tao Bao
1dca55fde5
skip the merge of 67e7c661
to lmp-mr1-ub-dev
...
The change (007979ee
) was cherry-picked from mnc-dev back to
lmp-mr1-dev. It doesn't need to flow further.
Change-Id: I0469708f1f3a0863f194a5820c7aeda4d163cbb7
2015-08-11 23:22:37 -07:00
Tao Bao
67e7c66124
am 007979ee: Add support for clobbered blocks
...
* commit '007979ee7543a396d97b3e9ada21aca44d503597':
Add support for clobbered blocks
2015-08-12 05:18:37 +00:00
Tao Bao
007979ee75
Add support for clobbered blocks
...
In ext4 filesystems, some blocks might be changed even being mounted
R/O, such as the superblock (block 0). We need to exclude such blocks
from integrity verification. Plus such blocks should always be
written to the target by copying instead of patching.
Bug: http://b/20939131
Change-Id: If9efab3d7a0071a87b4d4297daf7963c3b818afe
(cherry picked from commit ff7778166b
)
2015-08-11 21:02:45 -07:00
Ian Pedowitz
e5a631585a
Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
2015-08-11 21:54:17 +00:00
Clay Murphy
71a33c4d5b
Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11
) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
2015-08-11 20:55:24 +00:00
Mike Dodd
a8b0905e16
Include new AOSP messaging app in base builds.
...
b/23110861
Change-Id: I365bedc809425c901982f867e671070344d1112b
2015-08-11 13:14:09 -07:00
Ian Pedowitz
4e0d34c7c7
Increasing arm(64)? emulator partition sizes to 1.5GB
...
Bug: 23093319
Change-Id: I5e493ef4715cee96ae6ab40d6415f5330075fad6
2015-08-11 12:53:39 -07:00
Ian Pedowitz
073f74d908
Merge "Increasing x86 emulator system partition size" into mnc-dev
2015-08-11 19:12:28 +00:00
Ian Pedowitz
a18c5028d7
Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
...
Change-Id: Ic5af01a7017d2ac5b73d677689d15e4a8ad5dc14
2015-08-11 10:02:15 -07:00
Ian Pedowitz
38ffb0cf89
Bump PLATFORM_PREVIEW_SDK_VERSION to 4
...
Change-Id: Ia44cfc3ff839c9ec84aec32e37c42b96de67075e
2015-08-11 07:50:04 -07:00
Ian Pedowitz
5394e8bd12
Increasing x86 emulator system partition size
...
Seems sdk_google_phone_x86 is building larger than 750MB
Bug: 23093319
Change-Id: Ib3ddbbb96a9dcea02eb6da7362ac0142bdfae4de
2015-08-11 03:39:34 +00:00
Omari Stephens
a76428792f
Add the ability to display annotations in the generated docs
...
(cherry-picked from commit 87c44d8a11
)
Bug: 8440225
Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
2015-08-10 17:48:08 -07:00
Yusuf Ozuysal
736463f86c
Merge "Add support-customtabs to the doc build." into mnc-dev
2015-08-07 00:10:39 +00:00
Ying Wang
66c8e8c756
Don't prepend CC_WRAPPER to CLANG.
...
We have deferred the CC_WRAPPER prepending to binary.mk per module.
Bug: 22612634
Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5
2015-08-03 14:06:58 -07:00
Dianne Hackborn
56866c4d0e
Merge "Remove M codename, version number is 6.0." into mnc-dev
2015-07-31 17:37:50 +00:00