p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
23,741 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

23741 Commits

Author SHA1 Message Date
Zach Jang e7bc1542db resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 
am: 3749025ccb

Change-Id: Idadb32ede7b3699e0db8ce632d37e7d2cf99e82b
 2016-06-22 01:38:31 +00:00
Zach Jang 3749025ccb resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 
am: 9fc3cf7ba2

Change-Id: Idcd5da62fd7c36da94af3a15f35d179e1a3940f2
 2016-06-22 01:35:58 +00:00
Zach Jang 9fc3cf7ba2 resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 
am: cbf1e2cc94

Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5
 2016-06-22 01:33:23 +00:00
Zach Jang cbf1e2cc94 resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 
am: cf51c6cb29

Change-Id: Id5206a36ff4cee1de3e15f9d5efc64ee731434ee
 2016-06-22 01:30:23 +00:00
Zach Jang cf51c6cb29 resolve merge conflicts of 12db224 to lmp-mr1-dev 
am: 0c672afc40

Change-Id: Ibfaa4fa1c68fff09bbee52855a99e296bb603d45
 2016-06-22 01:27:49 +00:00
Zach Jang 0c672afc40 resolve merge conflicts of 12db224 to lmp-mr1-dev 
Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
 2016-06-21 18:23:46 -07:00
Zach Jang 12db224269 resolve merge conflicts of 24cfbfa to lmp-dev 
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
 2016-06-21 18:13:17 -07:00
Zach Jang 24cfbfabb7 Updating security string to 2016-08-05 am: 5b14c1f7ce 
am: 26acdf0c13

Change-Id: I5fa856d2a68d672f314f36c315c3f1857fd386ba
 2016-06-22 00:44:33 +00:00
Zach Jang 26acdf0c13 Updating security string to 2016-08-05 
am: 5b14c1f7ce

Change-Id: I5b2665a6e208d676169b33c08c6761d9de8b8320
 2016-06-22 00:41:51 +00:00
Zach Jang 5b14c1f7ce Updating security string to 2016-08-05 
b/29513589

Change-Id: I5ab4a0aa9d26a95dd0e85d87dcc487867b3f284b
 2016-06-20 14:30:52 -07:00
Baligh Uddin 5d77e7e0c1 Add system/extras/verity/build_verity_metadata.py to otatools 
am: e718501021

* commit 'e718501021dd039875745d3ff829341c2bb05248':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: I25d3edc76e97f1249768bd9e9bbbecdf8fc5fe79
 2016-05-27 23:40:02 +00:00
Baligh Uddin a21a89051e DO NOT MERGE ANYWHERE - 
am: 442ae0fe5c  -s ours

* commit '442ae0fe5c76ddabe52e595689a86838820ecbf1':
  DO NOT MERGE ANYWHERE -

Change-Id: I5bbd69cd7d85e3b4257d365efe07c38586d45433
 2016-05-27 23:32:09 +00:00
Baligh Uddin e718501021 Add system/extras/verity/build_verity_metadata.py to otatools 
Bug: 29008004
 2016-05-27 16:28:36 -07:00
Baligh Uddin 442ae0fe5c DO NOT MERGE ANYWHERE - 
Broke the build in mnc-dr-dev

Revert "Add system/extras/verity/build_verity_metadata.py  to otatools"

Bug: 29008004

This reverts commit d26a99c3c6.

Change-Id: Ic56a3d382a48a68f6c6f97684c045ec943be1423
 2016-05-27 23:19:57 +00:00
Baligh Uddin 1e7c1290c6 Add system/extras/verity/build_verity_metadata.py to otatools 
am: d26a99c3c6

* commit 'd26a99c3c6903c02c5435ec5f0123f057527b0a9':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: I94f04639338cdb961f3c378b12b8778c89fed232
 2016-05-27 22:37:29 +00:00
Baligh Uddin d26a99c3c6 Add system/extras/verity/build_verity_metadata.py to otatools 
Bug: 29008004
 2016-05-27 15:19:31 -07:00
Zach Jang 4af9b20fbd Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 
am: db34ed5f83

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

Change-Id: I9fa607cd71960ac309a5a791e8572a7e183a54d0
 2016-05-25 20:52:57 +00:00
Zach Jang db34ed5f83 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
 2016-05-25 20:44:22 +00:00
Zach Jang d5e1f1ee8e 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
 2016-05-25 20:39:29 +00:00
Zach Jang bf5d08ecf4 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
 2016-05-25 20:39:28 +00:00
Zach Jang 2823643ecd 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
 2016-05-25 20:34:47 +00:00
Zach Jang 7cc20fe0a0 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
 2016-05-25 20:34:46 +00:00
Zach Jang 4c9d484078 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
 2016-05-25 20:30:15 +00:00
Zach Jang e7660e56ad 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
 2016-05-25 20:30:14 +00:00
Zach Jang afbf826576 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
 2016-05-25 20:25:14 +00:00
Zach Jang ab6c08949f Merge "Updating security string to 2016-07-05" into lmp-mr1-dev 2016-05-25 20:21:24 +00:00
Zach Jang e496a955f4 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
 2016-05-25 20:20:57 +00:00
Zach Jang 1fc50f59ff 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
 2016-05-25 20:16:34 +00:00
Zach Jang 79770b1927 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
 2016-05-25 20:11:54 +00:00
Zach Jang 60270ec785 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
 2016-05-25 20:07:30 +00:00
Zach Jang 555c5af89a 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
 2016-05-25 20:03:05 +00:00
Zach Jang f885e95375 DO NOT MERGE Updating security string to 2016-07-05 
b/28912173

Change-Id: I81301d51fd62932005a24178c57a0731566910a6
 2016-05-25 19:43:28 +00:00
Zach Jang ea3b024d7d Updating security string to 2016-07-05 
b/28912173

Change-Id: I5dafe754c226eeb3f0beb3b23b219df2b82ef372
 2016-05-25 12:38:46 -07:00
Zach Jang 37e618fef8 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
 2016-05-24 01:27:10 +00:00
Zach Jang bc60af7bfd 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
 2016-05-24 01:22:07 +00:00
Zach Jang 9ae8c7356e 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
 2016-05-24 01:19:37 +00:00
Zach Jang 8ebaeae1f6 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
 2016-05-24 01:17:01 +00:00
Zach Jang 3cba9b15f7 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
 2016-05-24 01:14:26 +00:00
Zach Jang 2d75d4447c 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
 2016-05-24 01:14:26 +00:00
Zach Jang 8b961c808b 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
 2016-05-24 01:11:45 +00:00
Zach Jang 608f329e07 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
 2016-05-24 01:11:45 +00:00
Zach Jang 3e082f1e64 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
 2016-05-24 01:09:15 +00:00
Zach Jang e495d379de 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
 2016-05-24 01:09:14 +00:00
Zach Jang 2ee84bf0a5 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
 2016-05-24 01:06:37 +00:00
Zach Jang 0b4608ca4d Updating security string to 2016-07-01 am: 45ff24a04b 
am: 1dd3095e78

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

Change-Id: Id2e67d174cc1c79cbc418089aa7870ff38102a08
 2016-05-24 01:06:37 +00:00
Zach Jang 1dd3095e78 Updating security string to 2016-07-01 
am: 45ff24a04b

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

Change-Id: I426da21a6ba7c2e62a7f57765c0c35063d151ad4
 2016-05-24 01:02:06 +00:00
Zach Jang 0bdac8fba3 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
 2016-05-24 01:02:05 +00:00
Zach Jang 45ff24a04b Updating security string to 2016-07-01 
b/28912173

Change-Id: Ib40892d3185285cf4e95abb655a96c76258e17b1
 2016-05-23 13:26:32 -07:00
Zach Jang 89f6f7aa01 DO NOT MERGE Updating security string to 2016-07-01 
- for klp-dev only

b/28912173

Change-Id: I233f130629bc7f3b8f44bcc1e05177a17e0448b5
 2016-05-23 13:19:30 -07:00
Baligh Uddin 6c70b85cb3 Merge commit \'8c0c5e61498783496eec848da4f2aa4e30fe98b6\' into mnc-dr-dev 
am: 275af3429f

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

Change-Id: I7e26f26d773c1dac31b274b6c7e708aee1537be8
 2016-05-21 00:04:37 +00:00