Commit Graph

23683 Commits

Author SHA1 Message Date
Bart Sears
c69aa42b43 Merge "Set the Security Patch level for MNC" into mnc-dev 2015-08-26 03:40:38 +00:00
Tao Bao
e9a98cd687 am 87e6b493: am d3a79db8: am afc5ab39: am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev
* commit '87e6b493e5d356b71914b9f54e052d28e07ed9f0':
  add otatools-package target
2015-08-26 00:00:25 +00:00
Tao Bao
87e6b493e5 am d3a79db8: am afc5ab39: am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev
* commit 'd3a79db8fe09ac4d5bb404f4bb48a5f66d005db2':
  add otatools-package target
2015-08-25 23:49:14 +00:00
Tao Bao
d3a79db8fe am afc5ab39: am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev
* commit 'afc5ab39d84e9fc5fecbcd3c5a77fe4f956ff825':
  add otatools-package target
2015-08-25 23:39:51 +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
43703d8c46 am 3fd0db83: am 3b8b8657: am ca19158e: am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev
* commit '3fd0db83303cbda401fc373abb51ea9e89886349':
  Increasing all emulator system image sizes
2015-08-25 18:45:42 +00:00
Konstantinos Menychtas
3fd0db8330 am 3b8b8657: am ca19158e: am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev
* commit '3b8b865734cf457ffa9ff70c3f2b8bb507d1f4fb':
  Increasing all emulator system image sizes
2015-08-25 18:37:34 +00:00
Konstantinos Menychtas
3b8b865734 am ca19158e: am e9a8f465: (-s ours) resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev
* commit 'ca19158e034d6e0f5a605698c0f303893a2b9248':
  Increasing all emulator system image sizes
2015-08-25 18:31:01 +00: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
425e1d5c57 am e24174d2: am 15bb28fc: am ed7e864a: 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
* commit 'e24174d2a204983e7263c6d229c3cfc547bc2ec0':
  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/
2015-08-24 16:54:54 +00:00
smain@google.com
e24174d2a2 am 15bb28fc: am ed7e864a: 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
* commit '15bb28fc73fa30e9c7b8ee0d924c8906724809e0':
  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/
2015-08-24 16:48:53 +00:00
smain@google.com
15bb28fc73 am ed7e864a: 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 scr
* commit 'ed7e864a735f004f1dbb4a2db5261855b5693913':
  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/
2015-08-24 16:41:18 +00:00
Tao Bao
ecb3bbf4bf am 7c4c6f58: sparse_img.py: Divide NONZERO blocks into groups.
* commit '7c4c6f589e846d838136de148ae7e7d680c74d91':
  sparse_img.py: Divide NONZERO blocks into groups.
2015-08-20 18:20:46 +00: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
Tao Bao
7c4c6f589e sparse_img.py: Divide NONZERO blocks into groups.
For squashfs, we currently don't have a system.map. So the whole system
image will be treated as a single file. But for some unknown bug, the
updater will be killed due to OOM when writing back the patched image to
flash (observed on lenok-userdebug MEA49). Prior to getting a real fix,
we evenly divide the non-zero blocks into smaller groups (currently 1024
blocks or 4MB per group).

Bug: 23227672
Change-Id: Ifeddd8d802f01f8cd2a743a1d1217a284fb6e182
2015-08-19 17:10:23 -07:00
Konstantinos Menychtas
3337d1eb29 am 58aacccb: am 39b32b0d: am 956e4693: Increasing MIPS emulator system image size and user-data image size
* commit '58aacccb2f491decb559a6c93abb35abcc64cfef':
  Increasing MIPS emulator system image size and user-data image size
2015-08-19 01:31:21 +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
58aacccb2f am 39b32b0d: am 956e4693: Increasing MIPS emulator system image size and user-data image size
* commit '39b32b0d1f0e016ee99830e5ef4c165a7e0576ce':
  Increasing MIPS emulator system image size and user-data image size
2015-08-18 18:35:07 +00:00
Konstantinos Menychtas
39b32b0d1f am 956e4693: Increasing MIPS emulator system image size and user-data image size
* commit '956e469327b1da4b635f20795ed48f6c36ba10d6':
  Increasing MIPS emulator system image size and user-data image size
2015-08-18 18:28:45 +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
Omari Stephens
c10e65ac58 Merge "DO NOT MERGE Revert "D.N.M. Revert "Add the ability to display annotations in the generated docs""" into mnc-ub-dev 2015-08-17 22:59:25 +00:00
Dirk Dougherty
23a7114fbb am 3de73270: am 8ea2636c: am 6a8f88cd: adjust image placement for m hero on medium screens.
* commit '3de7327062f452f3489e04aeb07b43efed32764f':
  adjust image placement for m hero on medium screens.
2015-08-17 00:13:21 +00:00
Dirk Dougherty
3de7327062 am 8ea2636c: am 6a8f88cd: adjust image placement for m hero on medium screens.
* commit '8ea2636c190789263aaf78b89163c8e85bef3417':
  adjust image placement for m hero on medium screens.
2015-08-17 00:06:12 +00:00
Dirk Dougherty
8ea2636c19 am 6a8f88cd: adjust image placement for m hero on medium screens.
* commit '6a8f88cdec931470256ade35ffe6b8097425e36f':
  adjust image placement for m hero on medium screens.
2015-08-16 23:57:48 +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
Omari Stephens
bc171e3e40 DO NOT MERGE Revert "D.N.M. Revert "Add the ability to display annotations in the generated docs""
This reverts commit 2d20e3d968.

Bug: 22723877
Bug: 8440225
2015-08-14 18:51:25 -07:00
Joe Fernandez
e491aea79d am 251d0ad1: am a2869db8: am 71e0a80c: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
* commit '251d0ad1914e958044ecbd7d9bad86d8e446ddd3':
  doc change: Add hero image for m and css for landing pages.
2015-08-13 23:23:14 +00:00
Joe Fernandez
251d0ad191 am a2869db8: am 71e0a80c: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
* commit 'a2869db89eb59e57b7f0cdfc5e526d5257b95ecc':
  doc change: Add hero image for m and css for landing pages.
2015-08-13 23:15:45 +00:00
Joe Fernandez
a2869db89e am 71e0a80c: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
* commit '71e0a80c2c2fdc26bb014685eebb874aa40f782d':
  doc change: Add hero image for m and css for landing pages.
2015-08-13 23:11:45 +00: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
795c7aad8c am 1fd599cb: am 98c570ab: am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
* commit '1fd599cbaeac173245dfb675a28c27bf3fcb2eca':
  Make sure only AppCompat (not it's tests) are in the docs
2015-08-13 17:50:20 +00:00
Chris Banes
1fd599cbae am 98c570ab: am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
* commit '98c570abb2baf6f1b34a2220233257ad903f1de0':
  Make sure only AppCompat (not it's tests) are in the docs
2015-08-13 17:41:38 +00:00
Chris Banes
98c570abb2 am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
* commit '743938fb0d4f56d7d009486fb90891eab9b50897':
  Make sure only AppCompat (not it's tests) are in the docs
2015-08-13 17:36:49 +00: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
689c097eb3 am 148839b2: am 17b06910: am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
* commit '148839b275619d89e3572668dbb54012117ef78b':
  Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:36:17 +00:00
Mike Dodd
148839b275 am 17b06910: am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
* commit '17b069107654c04f0ec2cc44d54da3a44006c710':
  Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:30:09 +00:00
Mike Dodd
17b0691076 am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
* commit '5bf35d0685ba62ded55cc63f3dd2f23b82cc645d':
  Include new AOSP messaging app in base AOSP telephony builds.
2015-08-13 15:22:44 +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
59a7652985 am 6ff3e53f: am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev
* commit '6ff3e53faaab66975674e16a1822d926c529bc5d':
  Fix issie #23116383: Include security patch level in Settings
2015-08-13 01:09:07 +00:00
Dianne Hackborn
6ff3e53faa am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev
* commit '897f3ba8b1cc402fca16720be345ba9c587c326b':
  Fix issie #23116383: Include security patch level in Settings
2015-08-13 01:02:21 +00:00