Elisa Pascual Trevino
ec071e07df
[DO NOT MERGE] Update Security String to 2018-01-05 from 2018-01-01 Bug: 69257226
...
am: b58800a22c
Change-Id: I15c6ee36fe858323759bcd91132b604adf0c3cc5
2017-11-14 00:52:23 +00:00
Alex Deymo
a1c5d47708
Merge "Update binary name to "brotli"." am: cbb4ec6cf0
...
am: ea26c8104e
Change-Id: I330a67434c9d69c3c9d9aadae495e92d9788928c
2017-11-13 22:58:16 +00:00
Tianjie Xu
2536607d90
Add multithread support to call imgdiff with block-limit
...
With the new implementation of handling large apks, we need to call
imgdiff with block-limit to split the apk and generate the patch at
the same time. The call to imgdiff would significantly increase the
time consumption of the "FindTransfers" function which we used to
execute sequentially. This cl addresses this issue and speeds up the
process by making the imgdiff call parallel.
Bug: 34220646
Test: Create and sideload an incremental package for angler
Change-Id: Id62e348418fc1d22e32ea6c8ac16d9ab3ec92d7b
2017-11-13 14:58:05 -08:00
Alex Deymo
ea26c8104e
Merge "Update binary name to "brotli"."
...
am: cbb4ec6cf0
Change-Id: Idd96e18f08b67568e84d75bcd460a6bad0a1c42f
2017-11-13 22:51:23 +00:00
Alex Deymo
cbb4ec6cf0
Merge "Update binary name to "brotli"."
2017-11-13 22:43:22 +00:00
Elisa Pascual Trevino
b58800a22c
[DO NOT MERGE] Update Security String to 2018-01-05 from 2018-01-01
...
Bug: 69257226
2017-11-13 22:23:06 +00:00
Elisa Pascual Trevino
0185c51295
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05 Bug: 69257226" into oc-dev am: 9a8d84b8ed
am: ec439b54fb
...
am: ed2f52ccb5
Change-Id: Icb90f760be666a1115a0b3d7b1f85fb143752181
2017-11-13 22:01:23 +00:00
Elisa Pascual Trevino
ed2f52ccb5
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05 Bug: 69257226" into oc-dev am: 9a8d84b8ed
...
am: ec439b54fb
Change-Id: I54c898d6a0d0dd5edc4ecbd6a069741079aaa3ea
2017-11-13 21:56:16 +00:00
Elisa Pascual Trevino
ec439b54fb
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05 Bug: 69257226" into oc-dev
...
am: 9a8d84b8ed
Change-Id: I01c2010599a495aec3943cda02ea22f85fdae29d
2017-11-13 21:54:22 +00:00
TreeHugger Robot
9a8d84b8ed
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05 Bug: 69257226" into oc-dev
2017-11-13 21:47:00 +00:00
Steven Moreland
9f719cdac2
Merge changes from topic "full-treble-split" am: 1f70f332fe
...
am: 73bacf3f2b
-s ours
Change-Id: I34d7041a1124d07e398fe43b0d376517b60a6d00
2017-11-13 21:14:26 +00:00
Steven Moreland
18d75a29c3
Use PRODUCT_ENFORCE_VINTF_MANIFEST. am: 9588438023
...
am: cb71efa50a
Change-Id: I01e7bd1eeba8ef1f9203f8d2256b862591663e9e
2017-11-13 21:14:05 +00:00
Steven Moreland
73bacf3f2b
Merge changes from topic "full-treble-split"
...
am: 1f70f332fe
Change-Id: I3351fed398e5f7b8be190330e46944f9e7e05f47
2017-11-13 21:11:01 +00:00
Steven Moreland
cb71efa50a
Use PRODUCT_ENFORCE_VINTF_MANIFEST.
...
am: 9588438023
Change-Id: I7202cd5f9b858f7f90cca60d2c5c2ea7d79499c8
2017-11-13 21:10:13 +00:00
Treehugger Robot
1f70f332fe
Merge changes from topic "full-treble-split"
...
* changes:
Break up PRODUCT_FULL_TREBLE into variables.
Use PRODUCT_ENFORCE_VINTF_MANIFEST.
2017-11-13 21:06:34 +00:00
Elisa Pascual Trevino
a9f64fc95a
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a
am: 3fea140429
am: 7a58ff0c94
am: 590dbe143d
am: 71b1a4d8ea
-s ours am: a80c186e97
am: 38b24d03b5
...
am: 14900aad64
Change-Id: Ie1c54e9c39a2e528558c4c47bce35a638917fa25
2017-11-13 21:02:31 +00:00
Elisa Pascual Trevino
14900aad64
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a
am: 3fea140429
am: 7a58ff0c94
am: 590dbe143d
am: 71b1a4d8ea
-s ours am: a80c186e97
...
am: 38b24d03b5
Change-Id: I7d2228b403f83f71a8be76684c8b2dc751828264
2017-11-13 21:00:27 +00:00
Elisa Pascual Trevino
38b24d03b5
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a
am: 3fea140429
am: 7a58ff0c94
am: 590dbe143d
am: 71b1a4d8ea
-s ours
...
am: a80c186e97
Change-Id: Ibcb992519fc57f6e257dced49b78283d5aca39c5
2017-11-13 20:57:17 +00:00
Elisa Pascual Trevino
a80c186e97
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a
am: 3fea140429
am: 7a58ff0c94
am: 590dbe143d
...
am: 71b1a4d8ea
-s ours
Change-Id: I862603d1941915c360b0dda3698da88ac7859748
2017-11-13 20:53:29 +00:00
Elisa Pascual Trevino
71b1a4d8ea
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a
am: 3fea140429
am: 7a58ff0c94
...
am: 590dbe143d
Change-Id: Iffff10dd426f956a4a99b3177b0e4863e532c70e
2017-11-13 20:49:54 +00:00
Elisa Pascual Trevino
089b4bdd56
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4
am: 5dee805136
am: a623ac9e10
am: c0ea47faf5
-s ours am: 87589b0faf
am: f686b8e219
am: 87aa71a0d6
am: 0646a5609f
am: b39c51f1b3
-s ours am: dfef936beb
am: 6319166c22
...
am: f691262946
Change-Id: If295fc7a8e15f63e3f4a84c044ec207d8a9895ad
2017-11-13 20:47:38 +00:00
Elisa Pascual Trevino
590dbe143d
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a
am: 3fea140429
...
am: 7a58ff0c94
Change-Id: I8216dc0c59b3a54673794957c1036070d9465b20
2017-11-13 20:46:44 +00:00
Elisa Pascual Trevino
f691262946
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4
am: 5dee805136
am: a623ac9e10
am: c0ea47faf5
-s ours am: 87589b0faf
am: f686b8e219
am: 87aa71a0d6
am: 0646a5609f
am: b39c51f1b3
-s ours am: dfef936beb
...
am: 6319166c22
Change-Id: I70c620338e1212f3abc685a435ecb554aba79111
2017-11-13 20:44:38 +00:00
Elisa Pascual Trevino
201574c0f7
[DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459
-s ours am: 2a81f8159f
-s ours am: e9e54c59aa
am: 81099d1dcb
am: 7d4d9a50d8
am: c4a00faf15
-s ours am: 9381b6b193
am: c4233bcb8e
am: 0f910b71e7
am: 78535d96c5
am: 6ee7f66356
-s ours am: ec5ef1c8b3
am: e3a14845a3
...
am: f302094110
Change-Id: I3fbbee863eeaa1fcead2ad2b5bd40fdf6799276c
2017-11-13 20:43:10 +00:00
Elisa Pascual Trevino
7a58ff0c94
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a
...
am: 3fea140429
Change-Id: I25d21d5613829b527d8c8d9e986c2ae3d74cde17
2017-11-13 20:42:38 +00:00
Elisa Pascual Trevino
f302094110
[DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459
-s ours am: 2a81f8159f
-s ours am: e9e54c59aa
am: 81099d1dcb
am: 7d4d9a50d8
am: c4a00faf15
-s ours am: 9381b6b193
am: c4233bcb8e
am: 0f910b71e7
am: 78535d96c5
am: 6ee7f66356
-s ours am: ec5ef1c8b3
...
am: e3a14845a3
Change-Id: I09b4297f973de94a657728bd726efba50ece9527
2017-11-13 20:39:06 +00:00
Elisa Pascual Trevino
6319166c22
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4
am: 5dee805136
am: a623ac9e10
am: c0ea47faf5
-s ours am: 87589b0faf
am: f686b8e219
am: 87aa71a0d6
am: 0646a5609f
am: b39c51f1b3
-s ours
...
am: dfef936beb
Change-Id: I885a076f161b81e2dc0a4bcc051e0f0e0a6de5aa
2017-11-13 20:38:59 +00:00
Elisa Pascual Trevino
3fea140429
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev
...
am: 5b0a42789a
Change-Id: I9f09f136a764aee7fd98ac7ad49d571927e693be
2017-11-13 20:38:40 +00:00
Elisa Pascual Trevino
dfef936beb
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4
am: 5dee805136
am: a623ac9e10
am: c0ea47faf5
-s ours am: 87589b0faf
am: f686b8e219
am: 87aa71a0d6
am: 0646a5609f
...
am: b39c51f1b3
-s ours
Change-Id: I33895581acacee665d0e3881cab894145cc20c51
2017-11-13 20:36:27 +00:00
Elisa Pascual Trevino
e3a14845a3
[DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459
-s ours am: 2a81f8159f
-s ours am: e9e54c59aa
am: 81099d1dcb
am: 7d4d9a50d8
am: c4a00faf15
-s ours am: 9381b6b193
am: c4233bcb8e
am: 0f910b71e7
am: 78535d96c5
am: 6ee7f66356
-s ours
...
am: ec5ef1c8b3
Change-Id: I32baea26c31ca17416f85ad83979d211ff93002e
2017-11-13 20:34:30 +00:00
Elisa Pascual Trevino
b39c51f1b3
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4
am: 5dee805136
am: a623ac9e10
am: c0ea47faf5
-s ours am: 87589b0faf
am: f686b8e219
am: 87aa71a0d6
...
am: 0646a5609f
Change-Id: I96250ec1405895a4f62bca3975ada4871288c254
2017-11-13 20:34:20 +00:00
TreeHugger Robot
5b0a42789a
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev
2017-11-13 20:33:33 +00:00
Elisa Pascual Trevino
0646a5609f
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4
am: 5dee805136
am: a623ac9e10
am: c0ea47faf5
-s ours am: 87589b0faf
am: f686b8e219
...
am: 87aa71a0d6
Change-Id: Ia39c79a77dc17a3535ea7f36fb5278ef4abdfaa5
2017-11-13 20:32:18 +00:00
Elisa Pascual Trevino
ec5ef1c8b3
[DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459
-s ours am: 2a81f8159f
-s ours am: e9e54c59aa
am: 81099d1dcb
am: 7d4d9a50d8
am: c4a00faf15
-s ours am: 9381b6b193
am: c4233bcb8e
am: 0f910b71e7
am: 78535d96c5
...
am: 6ee7f66356
-s ours
Change-Id: Ic9720186613bae8e17bbc8624fad1a5154e30135
2017-11-13 20:30:59 +00:00
Elisa Pascual Trevino
87aa71a0d6
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4
am: 5dee805136
am: a623ac9e10
am: c0ea47faf5
-s ours am: 87589b0faf
...
am: f686b8e219
Change-Id: Iefd2d76df2c35ee22ba093e1ea7ba0e4f539615d
2017-11-13 20:30:13 +00:00
Elisa Pascual Trevino
6ee7f66356
[DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459
-s ours am: 2a81f8159f
-s ours am: e9e54c59aa
am: 81099d1dcb
am: 7d4d9a50d8
am: c4a00faf15
-s ours am: 9381b6b193
am: c4233bcb8e
am: 0f910b71e7
...
am: 78535d96c5
Change-Id: I6f7dae44b9c1d87812a69656150862285139f6fc
2017-11-13 20:28:22 +00:00
Elisa Pascual Trevino
f686b8e219
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4
am: 5dee805136
am: a623ac9e10
am: c0ea47faf5
-s ours
...
am: 87589b0faf
Change-Id: I2fd3754ca068edc5d0e4a79fcc5f17290a40431d
2017-11-13 20:28:11 +00:00
Elisa Pascual Trevino
87589b0faf
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4
am: 5dee805136
am: a623ac9e10
...
am: c0ea47faf5
-s ours
Change-Id: I93eca47ffff730f9a7e535ca0d58ab869dc8596a
2017-11-13 20:25:56 +00:00
Elisa Pascual Trevino
78535d96c5
[DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459
-s ours am: 2a81f8159f
-s ours am: e9e54c59aa
am: 81099d1dcb
am: 7d4d9a50d8
am: c4a00faf15
-s ours am: 9381b6b193
am: c4233bcb8e
...
am: 0f910b71e7
Change-Id: Ia794ba3859ad17459be162579a0f099a171d982a
2017-11-13 20:24:18 +00:00
Elisa Pascual Trevino
c0ea47faf5
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4
am: 5dee805136
...
am: a623ac9e10
Change-Id: I50a40c0f00e65cb0efbd475a999e05c06d07a8c6
2017-11-13 20:24:06 +00:00
Elisa Pascual Trevino
0f910b71e7
[DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459
-s ours am: 2a81f8159f
-s ours am: e9e54c59aa
am: 81099d1dcb
am: 7d4d9a50d8
am: c4a00faf15
-s ours am: 9381b6b193
...
am: c4233bcb8e
Change-Id: I01823b24313ba1c93b51e75126199a536341c95e
2017-11-13 20:21:45 +00:00
Elisa Pascual Trevino
a623ac9e10
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4
...
am: 5dee805136
Change-Id: I68aa377b98b330ad7050538c47728d4ff728410e
2017-11-13 20:20:03 +00:00
Elisa Pascual Trevino
c4233bcb8e
[DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459
-s ours am: 2a81f8159f
-s ours am: e9e54c59aa
am: 81099d1dcb
am: 7d4d9a50d8
am: c4a00faf15
-s ours
...
am: 9381b6b193
Change-Id: I040c113c51429ba5e6f275aaa27b05ac6105c637
2017-11-13 20:19:43 +00:00
Elisa Pascual Trevino
5dee805136
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev
...
am: a246e378c4
Change-Id: If4d89287dd72bb074ef348ee41bb59f88f05ca5d
2017-11-13 20:17:34 +00:00
Elisa Pascual Trevino
9381b6b193
[DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459
-s ours am: 2a81f8159f
-s ours am: e9e54c59aa
am: 81099d1dcb
am: 7d4d9a50d8
...
am: c4a00faf15
-s ours
Change-Id: I7831d283f381a1251b0854b4835c21be565d1391
2017-11-13 20:15:56 +00:00
Elisa Pascual Trevino
c4a00faf15
[DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459
-s ours am: 2a81f8159f
-s ours am: e9e54c59aa
am: 81099d1dcb
...
am: 7d4d9a50d8
Change-Id: Ic457f5ae443c68d83d7c5bf78d4475625a90d184
2017-11-13 20:13:36 +00:00
TreeHugger Robot
a246e378c4
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev
2017-11-13 20:12:21 +00:00
Elisa Pascual Trevino
7d4d9a50d8
[DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459
-s ours am: 2a81f8159f
-s ours am: e9e54c59aa
...
am: 81099d1dcb
Change-Id: Ia5bd95f347b19731ee2ad4bf101fea2f2cc8d27d
2017-11-13 20:10:04 +00:00
Elisa Pascual Trevino
81099d1dcb
[DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459
-s ours am: 2a81f8159f
-s ours
...
am: e9e54c59aa
Change-Id: Iac321f1bb0261acfa78beedbe829442826fee3be
2017-11-13 20:07:03 +00:00
Elisa Pascual Trevino
e9e54c59aa
[DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459
-s ours
...
am: 2a81f8159f
-s ours
Change-Id: I5d924bdbdc3a922b7c4677095c0cbf787ffcbc22
2017-11-13 20:04:55 +00:00