git.osdn.net Git - android-x86/build.git/log

Zach Jang [Wed, 25 May 2016 20:44:23 +0000 (20:44 +0000)]

DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a am: 60270ec785 -s ours am: 79770b1927 -s ours am: 1fc50f59ff am: e496a955f4 am: afbf826576 -s ours am: 4c9d484078 am: 2823643ecd
am: d5e1f1ee8e

* commit 'd5e1f1ee8e3ba4051785fd7bc2b2ec384870a829':
DO NOT MERGE Updating security string to 2016-07-05

Change-Id: I93652c1e6e3bc3b8a2bd48a50cb8f1dbafac9d59

commit | commitdiff | tree

Zach Jang [Wed, 25 May 2016 20:39:29 +0000 (20:39 +0000)]

DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a am: 60270ec785 -s ours am: 79770b1927 -s ours am: 1fc50f59ff am: e496a955f4 am: afbf826576 -s ours am: 4c9d484078
am: 2823643ecd

* commit '2823643ecdbfd8ad700834dd292fa2b827072634':
DO NOT MERGE Updating security string to 2016-07-05

Change-Id: I1a9612e6c22d631d634cdab47a733e0e22b285a4

commit | commitdiff | tree

Zach Jang [Wed, 25 May 2016 20:34:47 +0000 (20:34 +0000)]

DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a am: 60270ec785 -s ours am: 79770b1927 -s ours am: 1fc50f59ff am: e496a955f4 am: afbf826576 -s ours
am: 4c9d484078

* commit '4c9d484078d45bef09147e5beaf475f9aba96eb4':
DO NOT MERGE Updating security string to 2016-07-05

Change-Id: If826c11507df71dc36228d0b5b845078080e37a2

commit | commitdiff | tree

Zach Jang [Wed, 25 May 2016 20:30:15 +0000 (20:30 +0000)]

DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a am: 60270ec785  -s ours am: 79770b1927  -s ours am: 1fc50f59ff am: e496a955f4
am: afbf826576  -s ours

* commit 'afbf826576540aa15310d018235f90f8cfd6c6fc':
  DO NOT MERGE Updating security string to 2016-07-05

Change-Id: I83310642258499e75c191cc9969da5ffa2d91c3d

commit | commitdiff | tree

Zach Jang [Wed, 25 May 2016 20:25:14 +0000 (20:25 +0000)]

DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a am: 60270ec785 -s ours am: 79770b1927 -s ours am: 1fc50f59ff
am: e496a955f4

* commit 'e496a955f40fafb3073f7aef8be89c704ce0f01c':
DO NOT MERGE Updating security string to 2016-07-05

Change-Id: I24dd5be0560f7b6826dfd4700510f2517f1604ff

commit | commitdiff | tree

Zach Jang [Wed, 25 May 2016 20:20:57 +0000 (20:20 +0000)]

DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a am: 60270ec785 -s ours am: 79770b1927 -s ours
am: 1fc50f59ff

* commit '1fc50f59ff732131122d8fbcdbb497561e434364':
DO NOT MERGE Updating security string to 2016-07-05

Change-Id: I65cc7edc2d2b69fb7d3fc3745dc3662ddb59be63

commit | commitdiff | tree

Zach Jang [Wed, 25 May 2016 20:16:34 +0000 (20:16 +0000)]

DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a am: 60270ec785  -s ours
am: 79770b1927  -s ours

* commit '79770b192771b7e332f1537fef3e3719b07bcf14':
  DO NOT MERGE Updating security string to 2016-07-05

Change-Id: Ie757679100cd217973d8371de8a72adc89392bbc

commit | commitdiff | tree

Zach Jang [Wed, 25 May 2016 20:11:54 +0000 (20:11 +0000)]

DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a
am: 60270ec785 -s ours

* commit '60270ec78531308f91221ca09c74edee6701ec34':
DO NOT MERGE Updating security string to 2016-07-05

Change-Id: Ia89f4840478991109628844f889e6c97677b0d50

commit | commitdiff | tree

Zach Jang [Wed, 25 May 2016 20:07:30 +0000 (20:07 +0000)]

DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375
am: 555c5af89a

* commit '555c5af89a4b25f61ff827431b0081be7b70d5fe':
DO NOT MERGE Updating security string to 2016-07-05

Change-Id: I7f662a6d72179678beee82b3cfb87525eae2b2c2

commit | commitdiff | tree

Zach Jang [Wed, 25 May 2016 20:03:05 +0000 (20:03 +0000)]

DO NOT MERGE Updating security string to 2016-07-05
am: f885e95375

* commit 'f885e95375a48aeefd7d2451a5c61a48100bac77':
DO NOT MERGE Updating security string to 2016-07-05

Change-Id: Ic58e87cd25747728aa105047cf81a32253d4aba4

commit | commitdiff | tree

Zach Jang [Wed, 25 May 2016 19:41:59 +0000 (12:41 -0700)]

DO NOT MERGE Updating security string to 2016-07-05

b/28912173

Change-Id: I81301d51fd62932005a24178c57a0731566910a6

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:29:38 +0000 (01:29 +0000)]

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01 am: 0bdac8fba3 am: 2ee84bf0a5 -s ours am: e495d379de -s ours am: 8b961c808b am: 3cba9b15f7 am: 8ebaeae1f6 -s ours am: 9ae8c7356e am: bc60af7bfd
am: 37e618fef8

* commit '37e618fef8922f6a5790e2cf83f28ee48c46a213':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: Ifb8352e7397a3a80ce5041bf74e95c609cc7c754

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:27:10 +0000 (01:27 +0000)]

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01 am: 0bdac8fba3 am: 2ee84bf0a5 -s ours am: e495d379de -s ours am: 8b961c808b am: 3cba9b15f7 am: 8ebaeae1f6 -s ours am: 9ae8c7356e
am: bc60af7bfd

* commit 'bc60af7bfd4e7190086d59eea53b3dcf3cf40a6d':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: I4ce025692a6e6c0c96d5657d99131c306a742da4

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:22:07 +0000 (01:22 +0000)]

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01 am: 0bdac8fba3 am: 2ee84bf0a5 -s ours am: e495d379de -s ours am: 8b961c808b am: 3cba9b15f7 am: 8ebaeae1f6 -s ours
am: 9ae8c7356e

* commit '9ae8c7356efd1eadb9e4043d96cc5dc28ba554b6':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: I67fe439474ce9edd47194a926719b71b846a2a56

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:19:37 +0000 (01:19 +0000)]

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01 am: 0bdac8fba3 am: 2ee84bf0a5  -s ours am: e495d379de  -s ours am: 8b961c808b am: 3cba9b15f7
am: 8ebaeae1f6  -s ours

* commit '8ebaeae1f6f0a69fc1bf518558fa463ed0cca6de':
  DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: I07650552a45e5e2de1524b43839c895283d17c4a

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:17:01 +0000 (01:17 +0000)]

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01 am: 0bdac8fba3 am: 2ee84bf0a5 -s ours am: e495d379de -s ours am: 8b961c808b
am: 3cba9b15f7

* commit '3cba9b15f7ce25e194a305d37d27424e6923fd4b':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: Ib7e12ebb1a9140084a1e3aa28cede2809499004e

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:17:01 +0000 (01:17 +0000)]

Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07
am: 2d75d4447c

* commit '2d75d4447ca47666b20fe91e595a3274c8a975cf':
Updating security string to 2016-07-01

Change-Id: I59ad6e51072d854b052873a0ec32d8de2cdf5a1d

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:14:26 +0000 (01:14 +0000)]

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01 am: 0bdac8fba3 am: 2ee84bf0a5 -s ours am: e495d379de -s ours
am: 8b961c808b

* commit '8b961c808b6c67d464f4c070ea46b8a0650595d5':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: Id5916f2fa84a2fee99a37a1a8b9fd07d8c58ae0b

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:14:26 +0000 (01:14 +0000)]

Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64
am: 608f329e07

* commit '608f329e0718a9ef3ed89b3f9d4768b003bc88de':
Updating security string to 2016-07-01

Change-Id: I93c86db7e020f586784f8a8b106806dbb7874d76

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:11:45 +0000 (01:11 +0000)]

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01 am: 0bdac8fba3 am: 2ee84bf0a5  -s ours
am: e495d379de  -s ours

* commit 'e495d379decdfea93789c4693dd0f96aac23c34d':
  DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: I1749805100b45f8f12cac476df8e7be3380fbd54

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:11:45 +0000 (01:11 +0000)]

Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d
am: 3e082f1e64

* commit '3e082f1e649821f00ec751824e901f64a2756269':
Updating security string to 2016-07-01

Change-Id: I5c04b6e42927d45c9bf0e2f842cd9eac8f62dfa5

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:09:15 +0000 (01:09 +0000)]

Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78
am: 0b4608ca4d

* commit '0b4608ca4d8b10af335f839350a4224a198e8dee':
Updating security string to 2016-07-01

Change-Id: I08d096476c645d304ab5038cd5ca586073424157

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:09:14 +0000 (01:09 +0000)]

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01 am: 0bdac8fba3
am: 2ee84bf0a5 -s ours

* commit '2ee84bf0a56984323154411d60096b691c66b841':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: I7a2c2f1d707eb14b56b8e5227724427bdf0e2768

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:06:37 +0000 (01:06 +0000)]

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01
am: 0bdac8fba3

* commit '0bdac8fba335f4e1620871bf5082dbebc55a497d':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: I9c2b97af248ab4007fbfce8d67f9f70b5016687f

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:06:37 +0000 (01:06 +0000)]

Updating security string to 2016-07-01 am: 45ff24a04b
am: 1dd3095e78

* commit '1dd3095e780dc83aa1b4056f298a4678bead075a':
Updating security string to 2016-07-01

Change-Id: Id2e67d174cc1c79cbc418089aa7870ff38102a08

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:02:06 +0000 (01:02 +0000)]

Updating security string to 2016-07-01
am: 45ff24a04b

* commit '45ff24a04bd5d3af706ae3aa6266106560070a3d':
Updating security string to 2016-07-01

Change-Id: I426da21a6ba7c2e62a7f57765c0c35063d151ad4

commit | commitdiff | tree

Zach Jang [Tue, 24 May 2016 01:02:05 +0000 (01:02 +0000)]

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
am: 89f6f7aa01

* commit '89f6f7aa01591e8524ef0c4b5efa7433d082a9b9':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: I0e07966827713405ac2145a44185fe2f485c6e62

commit | commitdiff | tree

Zach Jang [Mon, 23 May 2016 20:26:32 +0000 (13:26 -0700)]

Updating security string to 2016-07-01

b/28912173

Change-Id: Ib40892d3185285cf4e95abb655a96c76258e17b1

commit | commitdiff | tree

Zach Jang [Mon, 23 May 2016 20:19:30 +0000 (13:19 -0700)]

DO NOT MERGE Updating security string to 2016-07-01
- for klp-dev only

b/28912173

Change-Id: I233f130629bc7f3b8f44bcc1e05177a17e0448b5

commit | commitdiff | tree

Baligh Uddin [Sat, 21 May 2016 00:14:04 +0000 (17:14 -0700)]

Merge commit '6c70b85cb3c75650e5154366fb5e08e3aadf9a50' into mnc-dr1.5-dev

commit | commitdiff | tree

Baligh Uddin [Sat, 21 May 2016 00:04:37 +0000 (00:04 +0000)]

Merge commit \'8c0c5e61498783496eec848da4f2aa4e30fe98b6\' into mnc-dr-dev
am: 275af3429f

* commit '275af3429f3049378862883dc6a0db2701f9311f':
Add Oem Props to otatools package

Change-Id: I7e26f26d773c1dac31b274b6c7e708aee1537be8

commit | commitdiff | tree

Baligh Uddin [Fri, 20 May 2016 23:59:14 +0000 (16:59 -0700)]

Merge commit '8c0c5e61498783496eec848da4f2aa4e30fe98b6' into mnc-dr-dev

commit | commitdiff | tree

Baligh Uddin [Fri, 20 May 2016 23:50:56 +0000 (23:50 +0000)]

Merge commit \'c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b\' into lmp-mr1-ub-dev
am: 50cae53b10

* commit '50cae53b10b7e6a18fe6016bd5dc9eaba715545d':
Add Oem Props to otatools package

Change-Id: I4ca967ea935f4a3a5c709047ca2ed486d196e974

commit | commitdiff | tree

Baligh Uddin [Fri, 20 May 2016 23:44:27 +0000 (16:44 -0700)]

Merge commit 'c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b' into lmp-mr1-ub-dev

commit | commitdiff | tree

Baligh Uddin [Fri, 20 May 2016 18:43:25 +0000 (18:43 +0000)]

Add Oem Props to otatools package
am: 4f8df41cef

* commit '4f8df41ceff7434ece651737b15bf1035f5549e8':
Add Oem Props to otatools package

Change-Id: I2b5ba1bb090c5144f4ea0b17153352eb31b46e7f

commit | commitdiff | tree

Baligh Uddin [Fri, 20 May 2016 18:29:53 +0000 (11:29 -0700)]

Add Oem Props to otatools package

Bug: 23967152

commit | commitdiff | tree

Baligh Uddin [Thu, 19 May 2016 16:47:58 +0000 (16:47 +0000)]

DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef
am: cea440c2eb

* commit 'cea440c2ebb8982158adc8bebf3a4cd85a5950fd':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)

Change-Id: Ia8380c1e5f81d7225baee928ba2a35290aca4f85

commit | commitdiff | tree

Baligh Uddin [Thu, 19 May 2016 16:43:34 +0000 (16:43 +0000)]

DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
am: 74da4d6eef

* commit '74da4d6eef1da6490729dfbd069adf913d9aa6fa':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)

Change-Id: Iefc0f7c90f631d6298931c9426d8edfbb60aa437

commit | commitdiff | tree

Baligh Uddin [Thu, 19 May 2016 15:50:19 +0000 (08:50 -0700)]

DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)

otatools.zip is used to release key sign device images.

Bug: 23967152

commit | commitdiff | tree

Tao Bao [Fri, 13 May 2016 22:41:42 +0000 (22:41 +0000)]

DO NOT MERGE rangelib.py: Fix the bug in monotonic check. am: 16536a53a0
am: 801dc8925f

* commit '801dc8925fcc148f438ceca751b2c14a853bece7':
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.

Change-Id: I98966afb7be0c91d4985985a5abd05fee05e0d8f

commit | commitdiff | tree

Tao Bao [Fri, 13 May 2016 22:39:07 +0000 (22:39 +0000)]

DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
am: 16536a53a0

* commit '16536a53a057778240b1a3a923b5dde31b79bd90':
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.

Change-Id: I07d7bf9a34dabd3646f341427d9f53a74e9e8fc9

commit | commitdiff | tree

Tao Bao [Thu, 27 Aug 2015 00:07:14 +0000 (17:07 -0700)]

DO NOT MERGE rangelib.py: Fix the bug in monotonic check.

RangeSet("2-10").monotonic gives a wrong result of "False". Fix the bug
and add more tests into test_rangelib.py.

Bug: 28760775
Change-Id: I04780571b45ecafd34040f405756b9745a9e21a5
(cherry picked from commit e8f756137c39fc3292014f2eab5f84c6e5135797)

commit | commitdiff | tree

Baligh Uddin [Fri, 13 May 2016 18:11:11 +0000 (18:11 +0000)]

Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev

commit | commitdiff | tree

Tianjie Xu [Fri, 13 May 2016 18:10:55 +0000 (18:10 +0000)]

DO NOT MERGE Monotonic flag sets incorrectly in rangelib am: 8d11597558
am: 8ae473d182

* commit '8ae473d18280e25d010c040147393a3b1e3bbc75':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib

Change-Id: Ibbed631ec32f00f026bdcf4af8a9a1213d87b4e5

commit | commitdiff | tree

Tianjie Xu [Fri, 13 May 2016 18:08:12 +0000 (18:08 +0000)]

DO NOT MERGE Monotonic flag sets incorrectly in rangelib
am: 8d11597558

* commit '8d1159755849ffcc1bd5c0de2821a4f5fe4ea58d':
DO NOT MERGE Monotonic flag sets incorrectly in rangelib

Change-Id: Ie0180bab1d41d86d3d2c3f14501b51b50f74635e

commit | commitdiff | tree

Tianjie Xu [Fri, 8 Apr 2016 03:17:48 +0000 (20:17 -0700)]

DO NOT MERGE Monotonic flag sets incorrectly in rangelib

After applying update_target_files_incr_ext4.sh, some files may end up
occupying unsorted block fragments. In one example, an apk file has the
block range [258768-259211,196604]. The monotonic flag in rangelib sets
incorrectly for this example and leads to a bad input file for imgdiff.
After fixing the flag, bsdiff is called instead of imgdiff and the
incremental OTA package generates successfully.

Bug: 28760775
Bug: 28053885
Change-Id: Ib841bf449ff6a29314fc4a1b8fba941a6dc532ac
(cherry picked from commit cd1e16a7616092e5a315b0a421a0c082da144145)
(cherry picked from commit 8d1159755849ffcc1bd5c0de2821a4f5fe4ea58d)

commit | commitdiff | tree

Tianjie Xu [Fri, 8 Apr 2016 03:17:48 +0000 (20:17 -0700)]

commit | commitdiff | tree

Baligh Uddin [Thu, 12 May 2016 23:17:37 +0000 (23:17 +0000)]

DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65  -s ours am: d28e7ea333  -s ours am: e038da17f3  -s ours am: e3b631a5d6  -s ours am: 7e806813bb  -s ours
am: e20dd6dca2  -s ours

* commit 'e20dd6dca20231b7e68f3a8874bccedc1e56c40f':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: I7391006c948be8188b8b197c1e318b76a826155a

commit | commitdiff | tree

Baligh Uddin [Thu, 12 May 2016 23:15:18 +0000 (23:15 +0000)]

DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65  -s ours am: d28e7ea333  -s ours am: e038da17f3  -s ours am: e3b631a5d6  -s ours
am: 7e806813bb  -s ours

* commit '7e806813bb0c3df85c69aaa78a21d0d5dac7e92b':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: Ic99ba9bb2041840402829b1d2e75684bfbeb66f2

commit | commitdiff | tree

Baligh Uddin [Thu, 12 May 2016 23:12:59 +0000 (23:12 +0000)]

DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65  -s ours am: d28e7ea333  -s ours am: e038da17f3  -s ours
am: e3b631a5d6  -s ours

* commit 'e3b631a5d62923a381bf0ecb151a1ec9c584380c':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: I7f17e328de62c50087bc6d2acf3d8c17f5fb541f

commit | commitdiff | tree

Baligh Uddin [Thu, 12 May 2016 23:10:35 +0000 (23:10 +0000)]

DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65  -s ours am: d28e7ea333  -s ours
am: e038da17f3  -s ours

* commit 'e038da17f38eac01e6c971d9f5956ea701a341e2':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: Ice12c95006ab0b10fa2d2a6413925001249564d8

commit | commitdiff | tree

Baligh Uddin [Thu, 12 May 2016 23:08:02 +0000 (23:08 +0000)]

DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65  -s ours
am: d28e7ea333  -s ours

* commit 'd28e7ea333986fe820f19f2b34dec074f3b8bc22':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: I65fd87879662e05d3906d530d5cba3e0d313990c

commit | commitdiff | tree

Baligh Uddin [Thu, 12 May 2016 23:05:19 +0000 (23:05 +0000)]

DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
am: f193546d65 -s ours

* commit 'f193546d65d41d40bd0e24e9bfe443001a320d1a':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: I3fe077a1b75e67963cfbcc7430912afd5143d418

commit | commitdiff | tree

Baligh Uddin [Thu, 12 May 2016 22:55:26 +0000 (15:55 -0700)]

DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Bug: 23967152
Change-Id: I2e2f1ead28f51f549dafacfc7d1d1e65b0b84bc7

commit | commitdiff | tree

Baligh Uddin [Wed, 11 May 2016 23:39:21 +0000 (23:39 +0000)]

DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
am: 16690162c3 -s ours

* commit '16690162c3eac9a40824c400822cb7023414a75b':
DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.

Change-Id: I299c80c92c58cd11f7f7914942728956c896cf50

commit | commitdiff | tree

Baligh Uddin [Wed, 11 May 2016 23:30:50 +0000 (16:30 -0700)]

DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.

This is needed for nemo* signing off emerald-dev.

Bug: 28726512

commit | commitdiff | tree

Baligh Uddin [Tue, 26 Apr 2016 15:52:21 +0000 (15:52 +0000)]

ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1 am: f3b80ae  -s ours am: d7aa910  -s ours
am: 7f53910  -s ours

* commit '7f53910f58a99f851ee838f0d93f66f5b639ac7b':
  ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1

Change-Id: Ibee22b00bc683d6efbe8b58b53edcc3a48cc4afc

commit | commitdiff | tree

Baligh Uddin [Tue, 26 Apr 2016 15:48:48 +0000 (15:48 +0000)]

ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1 am: f3b80ae  -s ours
am: d7aa910  -s ours

* commit 'd7aa9105041cae84551651836b50153eca3cc982':
  ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1

Change-Id: I384ba93902526354f52f480f9a3db55c7dfcb918

commit | commitdiff | tree

Baligh Uddin [Tue, 26 Apr 2016 15:45:50 +0000 (15:45 +0000)]

ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1
am: f3b80ae -s ours

* commit 'f3b80aed0a13baa078e2dd4c27849ce89307372b':
ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1

Change-Id: I7002ae9407e6098a9061b7ae11a893ddf19e4de4

commit | commitdiff | tree

Baligh Uddin [Mon, 25 Apr 2016 15:25:22 +0000 (08:25 -0700)]

ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1

Bug: 23967152

commit | commitdiff | tree

Baligh Uddin [Sun, 24 Apr 2016 19:46:27 +0000 (19:46 +0000)]

DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
am: 69cf5df -s ours

* commit '69cf5dfc4deee1a0d48e205c3420f5a60020bb41':
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools

Change-Id: I324adea1d5eee7b1c7ebddb119f63861c6559944

commit | commitdiff | tree

Baligh Uddin [Sun, 24 Apr 2016 19:40:03 +0000 (12:40 -0700)]

DO NOT MERGE ANYWHERE - Add squashFS tools to otatools

Bug: 23967152

commit | commitdiff | tree

Zach Jang [Wed, 20 Apr 2016 21:55:11 +0000 (21:55 +0000)]

Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77 am: d4b8d2b am: 63398dd
am: d402579

* commit 'd402579bc0beb02007172259c0c686b930cc77d4':
Update security patch string to 2016-06-01

Change-Id: I4b9b46ae2fec761ec84cec722d652658bf5489e0

commit | commitdiff | tree

Zach Jang [Wed, 20 Apr 2016 21:47:54 +0000 (21:47 +0000)]

Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77 am: d4b8d2b
am: 63398dd

* commit '63398dd7ea01ea331e2ea362c3235b79fefd5cfe':
Update security patch string to 2016-06-01

Change-Id: Icea8df8e59f72146ecf737473cbba19d0b6aba5d

commit | commitdiff | tree

Zach Jang [Wed, 20 Apr 2016 21:42:16 +0000 (21:42 +0000)]

Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77
am: d4b8d2b

* commit 'd4b8d2b59f804544e09cb3e600ff290792470999':
Update security patch string to 2016-06-01

Change-Id: I837a9f96b9d35f315b2bf92e600084ecb879b264

commit | commitdiff | tree

Zach Jang [Wed, 20 Apr 2016 21:35:11 +0000 (21:35 +0000)]

Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757
am: 05a8c77

* commit '05a8c77e4231828db15aee343f79ebd2dd6607dd':
Update security patch string to 2016-06-01

Change-Id: I427cd7ac7b33d5f5891ccd96a4fbaeb0a0f7c5e7

commit | commitdiff | tree

Zach Jang [Wed, 20 Apr 2016 19:50:19 +0000 (19:50 +0000)]

Update security patch string to 2016-06-01 am: 0a3b3d4
am: 0ca3757

* commit '0ca37573e53bc3a481daa3a807dfc6960227fb0f':
Update security patch string to 2016-06-01

Change-Id: I91bf9e0ce857dbb6cde8132e97499011b2325ba2

commit | commitdiff | tree

Zach Jang [Wed, 20 Apr 2016 18:49:54 +0000 (18:49 +0000)]

Update security patch string to 2016-06-01
am: 0a3b3d4

* commit '0a3b3d40c10e76e75d11a0c3cddc3ea637871886':
Update security patch string to 2016-06-01

Change-Id: I276f6d99393230230e514c6613d7a7d858a78a9a

commit | commitdiff | tree

Zach Jang [Tue, 19 Apr 2016 17:56:31 +0000 (10:56 -0700)]

Update security patch string to 2016-06-01

b/28269112

Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c

commit | commitdiff | tree

Tianjie Xu [Thu, 24 Mar 2016 17:22:07 +0000 (17:22 +0000)]

Merge "Adjust the size limit for splitting large files" into mnc-dr-dev am: 7d55185
am: 2c355a1

* commit '2c355a15bed912df7c77e9738d03d84f5a200194':
Adjust the size limit for splitting large files

commit | commitdiff | tree

Tianjie Xu [Thu, 24 Mar 2016 17:19:42 +0000 (17:19 +0000)]

Merge "Adjust the size limit for splitting large files" into mnc-dr-dev
am: 7d55185

* commit '7d551850ddea337b2b35938012e0d13a38c6af65':
Adjust the size limit for splitting large files

commit | commitdiff | tree

Tao Bao [Thu, 24 Mar 2016 17:12:00 +0000 (17:12 +0000)]

Merge "Adjust the size limit for splitting large files" into mnc-dr-dev

commit | commitdiff | tree

Tianjie Xu [Thu, 14 Jan 2016 00:14:10 +0000 (16:14 -0800)]

Adjust the size limit for splitting large files

Modify the number of max blocks per transfer to reduce splitting of
large files during patch generation. This will reduce the size of
final incremental OTA updater package. In specific, the size limit
for each file to transfer is set to 1/8 cachesize instead of a fix
number.

Bug: 26472126

Change-Id: Iffb135e378c4c7a91640f2fc4c40e9e93d1fe4bb
(cherry picked from commit bb86e1d9c298940a11da0a3d47ed40f7b709194d)

commit | commitdiff | tree

Zach Jang [Wed, 23 Mar 2016 01:07:14 +0000 (01:07 +0000)]

Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea am: 6bbd684 am: f32d07d
am: 0cf7987

* commit '0cf7987b7e96d2178fbb028e36992ffb1b589b38':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA

commit | commitdiff | tree

Zach Jang [Wed, 23 Mar 2016 01:03:47 +0000 (01:03 +0000)]

Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea am: 6bbd684
am: f32d07d

* commit 'f32d07dd9328401525e333a34464a1d1f363e524':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA

commit | commitdiff | tree

Zach Jang [Wed, 23 Mar 2016 01:00:15 +0000 (01:00 +0000)]

Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea
am: 6bbd684

* commit '6bbd684464a1307f074e6c173a9147d6e2a626f1':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA

commit | commitdiff | tree

Zach Jang [Wed, 23 Mar 2016 00:56:45 +0000 (00:56 +0000)]

Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483
am: 08d9bea

* commit '08d9bea41096f7c055cf67860a07436da6712b01':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA

commit | commitdiff | tree

Zach Jang [Wed, 23 Mar 2016 00:53:20 +0000 (00:53 +0000)]

Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780
am: 274e483

* commit '274e48378f92c711d28876380f34e263159cb81b':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA

commit | commitdiff | tree

Zach Jang [Wed, 23 Mar 2016 00:49:48 +0000 (00:49 +0000)]

Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
am: 175b780

* commit '175b7800f484edceee404abf21973859d5793c0d':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA

commit | commitdiff | tree

Zach Jang [Tue, 22 Mar 2016 00:59:40 +0000 (00:59 +0000)]

Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90 am: b90d094 am: fa24625 am: d7bf980
am: 87582a8

* commit '87582a8758970cc1178c9c63a7e5f8d97b02aa5d':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805

commit | commitdiff | tree

Zach Jang [Tue, 22 Mar 2016 00:56:58 +0000 (00:56 +0000)]

Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90 am: b90d094 am: fa24625
am: d7bf980

* commit 'd7bf9800f4f5fdc83b2ffb163207025459b26b36':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805

commit | commitdiff | tree

Zach Jang [Tue, 22 Mar 2016 00:54:07 +0000 (00:54 +0000)]

Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90 am: b90d094
am: fa24625

* commit 'fa2462551694090da0d0c941d805165c2e2f6dc2':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805

commit | commitdiff | tree

Zach Jang [Tue, 22 Mar 2016 00:51:24 +0000 (00:51 +0000)]

Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90
am: b90d094

* commit 'b90d09439a5901f78e9eae332f163cdc1ff98f49':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805

commit | commitdiff | tree

Zach Jang [Tue, 22 Mar 2016 00:48:45 +0000 (00:48 +0000)]

Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5
am: df28b90

* commit 'df28b90a7c45a02c4ba9896ad89f745a48fac7df':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805

commit | commitdiff | tree

Zach Jang [Tue, 22 Mar 2016 00:45:26 +0000 (00:45 +0000)]

Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
am: 2b71be5

* commit '2b71be536b6de0d16d0ae3224d1b00c41bec467e':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805

commit | commitdiff | tree

Zach Jang [Tue, 22 Mar 2016 00:42:55 +0000 (17:42 -0700)]

Update Security String to 2016-05-01 in preparation for May 2016 Security OTA

b/27724973

Change-Id: I572123586730e45b304f352c8b0fd6371ff5788b

commit | commitdiff | tree

Zach Jang [Fri, 18 Mar 2016 00:22:40 +0000 (00:22 +0000)]

Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba am: cdbccfd am: 5b24724 am: 592d1c5 am: bbf3687
am: b294912

* commit 'b29491287c683eaa53f567745e3935fb88f91b2f':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2

commit | commitdiff | tree

Zach Jang [Fri, 18 Mar 2016 00:20:22 +0000 (00:20 +0000)]

Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba am: cdbccfd am: 5b24724 am: 592d1c5
am: bbf3687

* commit 'bbf3687eb83878bbba380799c9f25af1b227bee6':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2

commit | commitdiff | tree

Zach Jang [Fri, 18 Mar 2016 00:18:01 +0000 (00:18 +0000)]

Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba am: cdbccfd am: 5b24724
am: 592d1c5

* commit '592d1c5a46b95015ec831febc953b17b721383e9':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2

commit | commitdiff | tree

Zach Jang [Fri, 18 Mar 2016 00:15:39 +0000 (00:15 +0000)]

Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba am: cdbccfd
am: 5b24724

* commit '5b24724ccf81ebbcfd20cebcb9f024c8fed3b5f2':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2

commit | commitdiff | tree

Zach Jang [Fri, 18 Mar 2016 00:13:25 +0000 (00:13 +0000)]

Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba
am: cdbccfd

* commit 'cdbccfda83da86eb8fd8007cc6c6ec2e59ad4223':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2

commit | commitdiff | tree

Zach Jang [Fri, 18 Mar 2016 00:11:47 +0000 (17:11 -0700)]

Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2
- kernel updates with patches for CVE-2015-1805

b/27724967

Change-Id: Ie9daf35dcba3f844c925358daf2646b7ab5b5f5f

commit | commitdiff | tree

Zach Jang [Fri, 18 Mar 2016 00:10:53 +0000 (00:10 +0000)]

Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
am: 7a498ba

* commit '7a498bafff136f1996042c6794ababcaff11d600':
Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2

commit | commitdiff | tree

Zach Jang [Fri, 18 Mar 2016 00:04:32 +0000 (17:04 -0700)]

Updating Security Patch String to: 2016-03-18
- March 2016 OTA v2

b/27724091

Change-Id: If448a426d78388208e15254ef30b42873a729647

commit | commitdiff | tree

Tao Bao [Wed, 9 Mar 2016 05:29:30 +0000 (05:29 +0000)]

Use the update-binary in the source build for downgrade OTAs. am: fa41fb2705
am: 7302eb7dd6

* commit '7302eb7dd6bd22c6123bd0b252889732e215592e':
Use the update-binary in the source build for downgrade OTAs.

commit | commitdiff | tree

Tao Bao [Wed, 9 Mar 2016 05:27:36 +0000 (05:27 +0000)]

Use the update-binary in the source build for downgrade OTAs.
am: fa41fb2705

* commit 'fa41fb27054185b3fba0519d01dabd21444fe772':
Use the update-binary in the source build for downgrade OTAs.

commit | commitdiff | tree

Tao Bao [Wed, 9 Mar 2016 01:53:39 +0000 (17:53 -0800)]

Use the update-binary in the source build for downgrade OTAs.

We used to use the update-binary from the target build when creating
incremental OTAs. But for downgrade OTAs, we should use the one in the
source build instead, which is actually newer.

Bug: 27556903
Change-Id: Ib6415729b979dbffdebdda24902f7f560942801a
(cherry picked from commit 4996cf03d2321eef56a8163c7fc73ba9976e1021)

commit | commitdiff | tree

Tao Bao [Tue, 8 Mar 2016 05:37:27 +0000 (05:37 +0000)]

resolve merge conflicts of 177c610e7f to cw-e-dev
am: bd25fcdc02

* commit 'bd25fcdc02a94ec9f50fc431a3731484b9812e23':
DO NOT MERGE releasetools: Support generating downgrade incremental OTAs.

commit | commitdiff | tree

Tao Bao [Tue, 8 Mar 2016 05:24:40 +0000 (21:24 -0800)]

resolve merge conflicts of 177c610e7f to cw-e-dev

Change-Id: Iba7820247d0b53d7f9553290eb0db3547f31beda

commit | commitdiff | tree

Tao Bao [Tue, 23 Feb 2016 19:38:39 +0000 (11:38 -0800)]

DO NOT MERGE releasetools: Support generating downgrade incremental OTAs.

Add --downgrade flag to ota_from_target_files.py script. It allows
generating an incremental OTA that updates from a newer build to an
older one (based on timestamp comparison). "post-timestamp" line in the
metadata file will be replaced by "ota-downgrade=yes". A data wipe will
always be enforced, so "ota-wipe=yes" will also be included in the
metadata file.

Bug: 26883782
Change-Id: Iaa05f662d948b7ab632a9fbb7051cc3f8bf68c21
(cherry picked from commit 5d1825664a0fec256fa28d62aadcac96f59a41b2)

build

RSS Atom

About OSDN

Find Software

Develop Software

Help