OSDN Git Service

android-x86/build.git
8 years agoAdd system/extras/verity/build_verity_metadata.py to otatools
Baligh Uddin [Fri, 27 May 2016 21:59:48 +0000 (14:59 -0700)]
Add system/extras/verity/build_verity_metadata.py  to otatools

Bug: 29008004

8 years agoMerge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am...
Zach Jang [Wed, 25 May 2016 20:44:22 +0000 (20:44 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0
am: bf5d08ecf4

* commit 'bf5d08ecf4cce47611ee58dbe6b0685e04725c87':
  Updating security string to 2016-07-05

Change-Id: I7de8ef605de344ceba9e634ea4f7eb127b91fcf7

8 years agoMerge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am...
Zach Jang [Wed, 25 May 2016 20:39:28 +0000 (20:39 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad
am: 7cc20fe0a0

* commit '7cc20fe0a058f3e2e323da12b0d5eb3c5d6311cb':
  Updating security string to 2016-07-05

Change-Id: I365f9fb0c5e2a29bbf93ea6476d3d697998b90b3

8 years agoDO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a...
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

8 years agoMerge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f
Zach Jang [Wed, 25 May 2016 20:34:46 +0000 (20:34 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f
am: e7660e56ad

* commit 'e7660e56ad330c8469857014c448130143c86856':
  Updating security string to 2016-07-05

Change-Id: I88edd89acdbdd63433fb595a2c7e7a048cd9cdfe

8 years agoDO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a...
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

8 years agoMerge "Updating security string to 2016-07-05" into lmp-mr1-dev
Zach Jang [Wed, 25 May 2016 20:30:14 +0000 (20:30 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev
am: ab6c08949f

* commit 'ab6c08949f2a96867b1eda536eeb74982a49d5d3':
  Updating security string to 2016-07-05

Change-Id: I2357ba1f5ba742ffdeed1fbcd9359405cbb436d8

8 years agoDO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a...
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

8 years agoMerge "Updating security string to 2016-07-05" into lmp-mr1-dev
Zach Jang [Wed, 25 May 2016 20:21:24 +0000 (20:21 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev

8 years agoDO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a
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

8 years agoDO NOT MERGE Updating security string to 2016-07-05 am: f885e95375
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

8 years agoDO NOT MERGE Updating security string to 2016-07-05
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

8 years agoDO NOT MERGE Updating security string to 2016-07-05
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

8 years agoUpdating security string to 2016-07-05
Zach Jang [Wed, 25 May 2016 19:38:46 +0000 (12:38 -0700)]
Updating security string to 2016-07-05

b/28912173

Change-Id: I5dafe754c226eeb3f0beb3b23b219df2b82ef372

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01...
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

8 years agoUpdating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d
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

8 years agoUpdating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01
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

8 years agoUpdating security string to 2016-07-01 am: 45ff24a04b
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

8 years agoUpdating security string to 2016-07-01
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
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

8 years agoUpdating security string to 2016-07-01
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01
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

8 years agoMerge commit '8c0c5e61498783496eec848da4f2aa4e30fe98b6' into mnc-dr-dev
Baligh Uddin [Fri, 20 May 2016 23:59:14 +0000 (16:59 -0700)]
Merge commit '8c0c5e61498783496eec848da4f2aa4e30fe98b6' into mnc-dr-dev

8 years agoMerge commit \'c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b\' into lmp-mr1-ub-dev
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

8 years agoMerge commit 'c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b' into lmp-mr1-ub-dev
Baligh Uddin [Fri, 20 May 2016 23:44:27 +0000 (16:44 -0700)]
Merge commit 'c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b' into lmp-mr1-ub-dev

8 years agoAdd Oem Props to otatools package
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

8 years agoAdd Oem Props to otatools package
Baligh Uddin [Fri, 20 May 2016 18:29:53 +0000 (11:29 -0700)]
Add Oem Props to otatools package

Bug: 23967152

8 years agoDO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
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

8 years agoDO NOT MERGE rangelib.py: Fix the bug in monotonic check.
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)

8 years agoDO NOT MERGE Monotonic flag sets incorrectly in rangelib
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)

8 years agoDO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65 -s ours am: d28e7...
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

8 years agoDO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65 -s ours am: d28e7...
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

8 years agoDO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65 -s ours
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

8 years agoDO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
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

8 years agoDO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
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

8 years agoUpdate security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77
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

8 years agoUpdate security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757
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

8 years agoUpdate security patch string to 2016-06-01 am: 0a3b3d4
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

8 years agoUpdate security patch string to 2016-06-01
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

8 years agoUpdate security patch string to 2016-06-01
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

8 years agoMerge "Adjust the size limit for splitting large files" into mnc-dr-dev
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

8 years agoAdjust the size limit for splitting large files
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)

8 years agoUpdate Security String to 2016-05-01 in preparation for May 2016 Security OTA am...
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

8 years agoUpdate Security String to 2016-05-01 in preparation for May 2016 Security OTA am...
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

8 years agoUpdate Security String to 2016-05-01 in preparation for May 2016 Security OTA am...
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

8 years agoUpdate Security String to 2016-05-01 in preparation for May 2016 Security OTA
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

8 years agoUpdate Security String to 2016-04-02 in preparation for April 2016 Security OTA v2...
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

8 years agoUpdate Security String to 2016-04-02 in preparation for April 2016 Security OTA v2...
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

8 years agoUpdate Security String to 2016-04-02 in preparation for April 2016 Security OTA v2...
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

8 years agoUpdate Security String to 2016-04-02 in preparation for April 2016 Security OTA v2...
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

8 years agoUpdate Security String to 2016-05-01 in preparation for May 2016 Security OTA
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

8 years agoUpdating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba am...
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

8 years agoUpdating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba am...
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

8 years agoUpdating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba
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

8 years agoUpdate Security String to 2016-04-02 in preparation for April 2016 Security OTA v2
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

8 years agoUpdating Security Patch String to: 2016-03-18 - March 2016 OTA v2
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

8 years agoUpdating Security Patch String to: 2016-03-18
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

8 years agoUse the update-binary in the source build for downgrade OTAs.
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)

8 years agoDO NOT MERGE releasetools: Support generating downgrade incremental OTAs.
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)

8 years agoAllow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 24 Feb 2016 02:46:46 +0000 (02:46 +0000)]
Allow to build against Mac OS X SDK 10.11.
am: 7f7c698959

* commit '7f7c6989590bd9395e8ebf3a01b5b4033c89d7d1':
  Allow to build against Mac OS X SDK 10.11.

8 years agoUpdate mac_sdk_versions_supported.
Ying Wang [Wed, 24 Feb 2016 02:46:36 +0000 (02:46 +0000)]
Update mac_sdk_versions_supported.
am: 8df3355f64

* commit '8df3355f64119adb9ca71c9f2cc9b51afb61c65a':
  Update mac_sdk_versions_supported.

8 years agoAllow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 14 Oct 2015 01:00:45 +0000 (18:00 -0700)]
Allow to build against Mac OS X SDK 10.11.

Bug: 24739158
Change-Id: I7c57e141dd02a0d2de5a7a1ccbc72ffe422a8d6f

8 years agoUpdate mac_sdk_versions_supported.
Ying Wang [Wed, 29 Jul 2015 23:35:40 +0000 (16:35 -0700)]
Update mac_sdk_versions_supported.

Now we requires Mac OS X SDK version at least 10.8.
Also removed the unnecessary sort call in getting
mac_sdk_versions_installed.
Lexical sort doesn't make sense when 10.10 is added to that list.
Actually the next makefile line makes sure we always get the first
match in $(mac_sdk_versions_supported):
mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed),
$(mac_sdk_versions_supported)))

Bug: 22825165
Change-Id: I4bfafabb11f94b66704d4799fe61fe3f16429538

8 years agoUpdating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a1633c8
Zach Jang [Fri, 19 Feb 2016 22:17:28 +0000 (22:17 +0000)]
Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a1633c8
am: eb651e2e45

* commit 'eb651e2e450f1756e6acea4f570379af7d146920':
  Updating security string patch to 2016-04-01

8 years agoUpdating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766
Zach Jang [Fri, 19 Feb 2016 22:11:32 +0000 (22:11 +0000)]
Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766
am: 7e6a1633c8

* commit '7e6a1633c8ebb622271020cbb0aedae355e6501a':
  Updating security string patch to 2016-04-01

8 years agoUpdating security string patch to 2016-04-01 am: e182d2a95c
Zach Jang [Fri, 19 Feb 2016 22:06:14 +0000 (22:06 +0000)]
Updating security string patch to 2016-04-01 am: e182d2a95c
am: 054bbb9766

* commit '054bbb9766312a2caefd5375341d49074a6d25bf':
  Updating security string patch to 2016-04-01

8 years agoUpdating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 22:00:21 +0000 (22:00 +0000)]
Updating security string patch to 2016-04-01
am: e182d2a95c

* commit 'e182d2a95c52e37d2a6f924c8ff386b52b08a0c9':
  Updating security string patch to 2016-04-01

8 years agoUpdating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 21:50:29 +0000 (13:50 -0800)]
Updating security string patch to 2016-04-01

b/27272697

Change-Id: I99c2c892a21f4c36226ea5f8d94689d6218ccf7e

8 years agoUpdating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f
Zach Jang [Tue, 12 Jan 2016 01:30:53 +0000 (01:30 +0000)]
Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f
am: c9da4cce57

* commit 'c9da4cce57d387f52b675d1024459af5e73c6dbc':
  Updating security patch string to 2016-03-01

8 years agoUpdating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e
Zach Jang [Tue, 12 Jan 2016 01:28:37 +0000 (01:28 +0000)]
Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e
am: 53e7d9bf7f

* commit '53e7d9bf7f298c438157dccc5222b7484b083d9e':
  Updating security patch string to 2016-03-01

8 years agoUpdating security patch string to 2016-03-01 am: c24c6ccd4d
Zach Jang [Tue, 12 Jan 2016 01:26:41 +0000 (01:26 +0000)]
Updating security patch string to 2016-03-01 am: c24c6ccd4d
am: 293887c43e

* commit '293887c43ee5b797f8628f5983f64bf766002009':
  Updating security patch string to 2016-03-01

8 years agoUpdating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:24:55 +0000 (01:24 +0000)]
Updating security patch string to 2016-03-01
am: c24c6ccd4d

* commit 'c24c6ccd4d5de8be010b74b9021b8fdb926e1dad':
  Updating security patch string to 2016-03-01

8 years agoUpdating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:12:37 +0000 (17:12 -0800)]
Updating security patch string to 2016-03-01

b/26499556

Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733

8 years agoDO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308...
Zach Jang [Wed, 9 Dec 2015 23:06:44 +0000 (23:06 +0000)]
DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308 am: 41846b0063  -s ours
am: db4d57a84c

* commit 'db4d57a84c8f0f6b51d9b69c2e0ec3ac825270c0':
  DO NOT MERGE - Update security string to 2016-02-01

8 years agoDO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308
Zach Jang [Wed, 9 Dec 2015 23:03:18 +0000 (23:03 +0000)]
DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308
am: 41846b0063  -s ours

* commit '41846b00633d3eba58193565c8f6c213006cea5d':
  DO NOT MERGE - Update security string to 2016-02-01

8 years agoDO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b
Zach Jang [Wed, 9 Dec 2015 23:00:35 +0000 (23:00 +0000)]
DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b
am: af970fb308

* commit 'af970fb308dd7914e8dccb56e8ea08d50e92e617':
  DO NOT MERGE - Update security string to 2016-02-01

8 years agoDO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 22:57:15 +0000 (14:57 -0800)]
DO NOT MERGE - Update security string to 2016-02-01
am: 929a4abd2b

* commit '929a4abd2b777715bc730593aee87643a30706d6':
  DO NOT MERGE - Update security string to 2016-02-01

8 years agoUpdate Security String to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 22:57:15 +0000 (14:57 -0800)]
Update Security String to 2016-02-01
am: f0f73c06e2

* commit 'f0f73c06e25e17ecf8e06f42c51efac102597f57':
  Update Security String to 2016-02-01

8 years agoDO NOT MERGE - Update security string to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 22:45:57 +0000 (14:45 -0800)]
DO NOT MERGE - Update security string to 2016-02-01

b/26110717

Change-Id: Ifbb78b8c7cd5d2efa9e5501fc4e7216f336ccadc

8 years agoUpdate Security String to 2016-02-01
Zach Jang [Wed, 9 Dec 2015 20:46:59 +0000 (12:46 -0800)]
Update Security String to 2016-02-01

b/26110717

Change-Id: I1085f5d053b07c6c81d2ef22fbba5ab9157a67f2

8 years agoUpdate Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8...
Zach Jang [Sat, 21 Nov 2015 01:01:49 +0000 (01:01 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8 am: 2cd2a76c64  -s ours
am: c7b96cdd5e

* commit 'c7b96cdd5e83ea7c62912bc779e7bc49c59023c7':
  Update Security String to 2016-01-01 - DO NOT MERGE

8 years agoUpdate Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8
Zach Jang [Sat, 21 Nov 2015 00:58:36 +0000 (00:58 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8
am: 2cd2a76c64  -s ours

* commit '2cd2a76c64dead0b057b7e9a1223f67f9a9d2e7f':
  Update Security String to 2016-01-01 - DO NOT MERGE

8 years agoUpdate Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad
Zach Jang [Sat, 21 Nov 2015 00:55:17 +0000 (00:55 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad
am: 645f200ae8

* commit '645f200ae8708414d06618989328dc3e3c84a917':
  Update Security String to 2016-01-01 - DO NOT MERGE

8 years agoUpdate Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 00:51:39 +0000 (00:51 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE
am: 58cdbdc5ad

* commit '58cdbdc5ad54f9c26d94860c2d0be712f88a8f07':
  Update Security String to 2016-01-01 - DO NOT MERGE

8 years agoUpdate Security String to 2016-01-01 to mnc-dev
Zach Jang [Sat, 21 Nov 2015 00:48:16 +0000 (00:48 +0000)]
Update Security String to 2016-01-01 to mnc-dev
am: 170459f438

* commit '170459f4385d35dd991549e1b545c376ca8df281':
  Update Security String to 2016-01-01 to mnc-dev

8 years agoUpdate Security String to 2016-01-01 to mnc-dev
Zach Jang [Fri, 20 Nov 2015 22:37:14 +0000 (14:37 -0800)]
Update Security String to 2016-01-01 to mnc-dev

http://b/25819582

Change-Id: Ie55f9476110b08591da05774f582a6e48ce12de7

8 years agoUpdate Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Fri, 20 Nov 2015 22:32:09 +0000 (14:32 -0800)]
Update Security String to 2016-01-01 - DO NOT MERGE

http://b/25819582

Change-Id: I99d8ca004bb5d35613f3a2314597717f6b7c04c7

8 years agoRevert "Change version back to 6.0"
Bart Sears [Sun, 15 Nov 2015 17:57:13 +0000 (17:57 +0000)]
Revert "Change version back to 6.0"

This reverts commit 970f203b3d3f17b778749c3ce47eb6b922aa606c.

Change-Id: Icd96990f128e303b0e2af5af0f0d4a0f7731fe60

8 years agoChange version back to 6.0
Bart Sears [Sun, 15 Nov 2015 07:50:18 +0000 (23:50 -0800)]
Change version back to 6.0

Temporarily set the version back to 6.0 and security patch to
2015-11-01.

Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b

8 years agoMerge "Update security string to 2015-12-01" into mnc-dev
Zach Jang [Tue, 27 Oct 2015 00:44:56 +0000 (00:44 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev
am: 54cb940c4a

* commit '54cb940c4a07701212e96f77ee4a89493b0f251b':
  Update security string to 2015-12-01

8 years agoMerge "Update security string to 2015-12-01" into mnc-dev
Zach Jang [Tue, 27 Oct 2015 00:37:40 +0000 (00:37 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev

8 years agoUpdate security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8 am: cc9ac27157...
Zach Jang [Mon, 26 Oct 2015 23:52:50 +0000 (23:52 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8 am: cc9ac27157 am: fe64ce145e  -s ours
am: 0e8cf97670

* commit '0e8cf97670c0b0a59d326507296829fe1bc01230':
  Update security string to 2015-12-01 - DO NOT MERGE