bowen_lai
a704ae4ecb
Merge "Create symbolic boot vdex files for different ISAs" am: 895a8172ee
am: 862a102804
...
am: 70077620c0
Change-Id: I83cc2a7c520e45b25f16aa6aa9d7ce146a746857
2018-02-14 01:35:19 +00:00
bowen_lai
70077620c0
Merge "Create symbolic boot vdex files for different ISAs" am: 895a8172ee
...
am: 862a102804
Change-Id: I17f671838d842a0a3c76c1b39a082b536e0eba60
2018-02-14 01:17:38 +00:00
Christopher Ferris
d0253ef4d5
Merge "Add libc_malloc_hook to list of libraries." am: 184b4d8560
am: d909c94848
...
am: 8ff1ffcc7b
Change-Id: I915c457b6c76d5bd487f26263a02682e5a958994
2018-02-14 01:15:55 +00:00
Christopher Ferris
8ff1ffcc7b
Merge "Add libc_malloc_hook to list of libraries." am: 184b4d8560
...
am: d909c94848
Change-Id: Iafd2976b5cc2d3e29aa31732670dfc9f6a377207
2018-02-14 01:10:05 +00:00
bowen_lai
862a102804
Merge "Create symbolic boot vdex files for different ISAs"
...
am: 895a8172ee
Change-Id: I226a47f93c3bffee6bf5942f86a983b71bd9367f
2018-02-14 01:05:46 +00:00
Jaekyun Seok
9cbf2e00df
Merge "Enable BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for full-treble products" am: 42c7cf0631
am: cae2ca8ef5
...
am: aabb24c3fc
Change-Id: Ic36f71be5b0d900f13c4d7eb2cb56391110ac90d
2018-02-14 01:04:42 +00:00
Christopher Ferris
d909c94848
Merge "Add libc_malloc_hook to list of libraries."
...
am: 184b4d8560
Change-Id: I7b8303ab179418f86db4946037af044b68caed9b
2018-02-14 01:02:43 +00:00
Treehugger Robot
895a8172ee
Merge "Create symbolic boot vdex files for different ISAs"
2018-02-14 00:59:56 +00:00
Jaekyun Seok
aabb24c3fc
Merge "Enable BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for full-treble products" am: 42c7cf0631
...
am: cae2ca8ef5
Change-Id: I9c5d64073d52735ae8f53bb702d6715771359583
2018-02-14 00:59:12 +00:00
Jaekyun Seok
cae2ca8ef5
Merge "Enable BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for full-treble products"
...
am: 42c7cf0631
Change-Id: I7efa870b5649108a2e59b52a682e16e5b8d10420
2018-02-14 00:55:58 +00:00
Christopher Ferris
184b4d8560
Merge "Add libc_malloc_hook to list of libraries."
2018-02-14 00:49:48 +00:00
Tao Bao
1440313315
Merge "releasetools: Specify max_timestamp for secondary payload." into oc-mr1-dev-plus-aosp
...
am: 221d1f4bde
-s ours
Change-Id: I78394c3753093fa6f18a83cf351a562c6d605857
2018-02-14 00:47:46 +00:00
Treehugger Robot
42c7cf0631
Merge "Enable BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for full-treble products"
2018-02-14 00:30:23 +00:00
TreeHugger Robot
221d1f4bde
Merge "releasetools: Specify max_timestamp for secondary payload." into oc-mr1-dev-plus-aosp
2018-02-14 00:26:57 +00:00
Adam Seaton
1086cb5e47
Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev am: 402397c7f2
am: 1bdbab9542
am: 4a57b9de88
...
am: 9f4cd386a0
-s ours
Change-Id: Ifd0a79cb0731e99904b116a00a118cec5f9e0149
2018-02-14 00:19:23 +00:00
Adam Seaton
9f4cd386a0
Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev am: 402397c7f2
am: 1bdbab9542
...
am: 4a57b9de88
Change-Id: I16382ca753dbe46836a848b1e3224a255d5ad884
2018-02-14 00:15:41 +00:00
Adam Seaton
4a57b9de88
Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev am: 402397c7f2
...
am: 1bdbab9542
Change-Id: If6a0846e43e34127265f2415a94f86cb2d5e53fb
2018-02-14 00:09:35 +00:00
Adam Seaton
ecebf9c349
Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev am: 656fd837e9
am: 05e66a80dc
am: 7231e99020
...
am: a540c9466b
-s ours
Change-Id: Iee3445aeb218861e202583f1cc08d24dae902295
2018-02-14 00:06:45 +00:00
Adam Seaton
1bdbab9542
Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev
...
am: 402397c7f2
Change-Id: I56dac0e3f017fcdd57e522dccb36ab09cbb15ae2
2018-02-14 00:05:33 +00:00
Adam Seaton
a540c9466b
Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev am: 656fd837e9
am: 05e66a80dc
...
am: 7231e99020
Change-Id: I9ed65a0bfddfcdd30873dff9cb683fc08d31f6dc
2018-02-14 00:01:05 +00:00
TreeHugger Robot
402397c7f2
Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev
2018-02-13 23:56:08 +00:00
Adam Seaton
7231e99020
Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev am: 656fd837e9
...
am: 05e66a80dc
Change-Id: Ia769104e933025596c98b66598091eca3e3a860d
2018-02-13 23:54:31 +00:00
Adam Seaton
05e66a80dc
Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev
...
am: 656fd837e9
Change-Id: Ic22c80e40cff1fe0afea3f26741d10c8a949b27b
2018-02-13 23:49:57 +00:00
TreeHugger Robot
656fd837e9
Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev
2018-02-13 23:35:05 +00:00
Adam Seaton
819b18263f
Merge changes from topic "am-ddd6c5a0-3aa8-4d6c-a3b8-0460c103683f" into oc-dev am: 0d66f2b854
am: 24cbf1d542
am: 0940a73880
...
am: c4c2338c69
Change-Id: I98d88b80f0c1120db527a4b89f14286a61a8339f
2018-02-13 23:19:16 +00:00
Tao Bao
9d0242d93e
Merge "releasetools: Allow generating BBOTA for images with shared blocks." am: 9452d84b97
am: 6c453193a1
...
am: 7088b88a17
Change-Id: I123238db80af7d60e92da4aef0478f9f5f1a29a5
2018-02-13 23:13:15 +00:00
Tao Bao
072f2e4784
Merge "releasetools: Remove the unconditional fallback to bsdiff." am: 6392e05813
am: 61fc7f6746
...
am: 6b2854d44d
Change-Id: Iac4c743329de3db006ed4a2d3782835a5002490b
2018-02-13 23:10:28 +00:00
Adam Seaton
c4c2338c69
Merge changes from topic "am-ddd6c5a0-3aa8-4d6c-a3b8-0460c103683f" into oc-dev am: 0d66f2b854
am: 24cbf1d542
...
am: 0940a73880
Change-Id: I8f2a5550f1d886cbc789b5c41456cbb05aa72e8c
2018-02-13 23:09:40 +00:00
Adam Seaton
0940a73880
Merge changes from topic "am-ddd6c5a0-3aa8-4d6c-a3b8-0460c103683f" into oc-dev am: 0d66f2b854
...
am: 24cbf1d542
Change-Id: Ic71e186c3a18799af5666090107d70f037a51c37
2018-02-13 23:04:02 +00:00
Adam Seaton
04ad5c9520
[automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06
am: 83709d3152
am: 70ea788dfa
skipped: ac14372129
am: 83c448128c
am: 50abbfdb53
am: 00a67ddab1
am: 2afc690751
skipped: 49f77737a2
am: b0aa7c342a
am: a26a50ba69
am: 2d955bd781
...
am: 90b42aa3db
-s ours
Change-Id: I7a794b7d11e41d8e73b050f1292d9b6b0df6400b
2018-02-13 23:00:22 +00:00
Adam Seaton
24cbf1d542
Merge changes from topic "am-ddd6c5a0-3aa8-4d6c-a3b8-0460c103683f" into oc-dev
...
am: 0d66f2b854
Change-Id: Ia001a0d70252c2b19658e9a29c7e5c4a2a9d9cd7
2018-02-13 23:00:17 +00:00
TreeHugger Robot
0d66f2b854
Merge changes from topic "am-ddd6c5a0-3aa8-4d6c-a3b8-0460c103683f" into oc-dev
...
* changes:
[automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd
am: e5018177a2
am: 9a781cc784
am: 82043e682d
skipped: 6206e9c2c4
[automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd
am: e5018177a2
am: 9a781cc784
am: 82043e682d
[automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd
am: e5018177a2
am: 9a781cc784
[automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd
am: e5018177a2
[automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd
[DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847
2018-02-13 22:48:46 +00:00
Tao Bao
7088b88a17
Merge "releasetools: Allow generating BBOTA for images with shared blocks." am: 9452d84b97
...
am: 6c453193a1
Change-Id: I422f6da0c524fa5329bc9dd11eb10eb27945ab92
2018-02-13 22:43:10 +00:00
Tao Bao
6b2854d44d
Merge "releasetools: Remove the unconditional fallback to bsdiff." am: 6392e05813
...
am: 61fc7f6746
Change-Id: I3729f15bb532838ce2b9ec3f084ee5b81e97d3b1
2018-02-13 22:35:42 +00:00
Tao Bao
db1fe41bbe
releasetools: Specify max_timestamp for secondary payload.
...
This is a mandatory field in the generated payload.
Bug: 35724498
Test: Generate OTA with --include_secondary. Check the generation
command for secondary payload.
Change-Id: Ib2e25cc020e294eae5a4be36d6dca297432804b8
Merged-In: Ib2e25cc020e294eae5a4be36d6dca297432804b8
(cherry picked from commit 6048121485
)
2018-02-13 14:34:55 -08:00
Tao Bao
6c453193a1
Merge "releasetools: Allow generating BBOTA for images with shared blocks."
...
am: 9452d84b97
Change-Id: Iab1c1e4f25f67fbf9eebb9ec8a4ff0ad7e05fd13
2018-02-13 22:34:25 +00:00
Adam Seaton
90b42aa3db
[automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06
am: 83709d3152
am: 70ea788dfa
skipped: ac14372129
am: 83c448128c
am: 50abbfdb53
am: 00a67ddab1
am: 2afc690751
skipped: 49f77737a2
am: b0aa7c342a
am: a26a50ba69
...
am: 2d955bd781
Change-Id: Ifec0f858474b1fe38bcd0bc32821cdcbb66c73b0
2018-02-13 22:32:04 +00:00
Tao Bao
61fc7f6746
Merge "releasetools: Remove the unconditional fallback to bsdiff."
...
am: 6392e05813
Change-Id: I1da2f7aedd14aaa5a19bfd8d83c7650272ed4214
2018-02-13 22:26:04 +00:00
Adam Seaton
2d955bd781
[automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06
am: 83709d3152
am: 70ea788dfa
skipped: ac14372129
am: 83c448128c
am: 50abbfdb53
am: 00a67ddab1
am: 2afc690751
skipped: 49f77737a2
am: b0aa7c342a
...
am: a26a50ba69
Change-Id: Id6ac55b836818ace08eda63dc109524d78576c86
2018-02-13 22:26:01 +00:00
Adam Seaton
a26a50ba69
[automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06
am: 83709d3152
am: 70ea788dfa
skipped: ac14372129
am: 83c448128c
am: 50abbfdb53
am: 00a67ddab1
am: 2afc690751
skipped: 49f77737a2
...
am: b0aa7c342a
Change-Id: I4d5509274415bb8b27708cec7d7137b78e2c16aa
2018-02-13 22:21:23 +00:00
Tao Bao
6048121485
releasetools: Specify max_timestamp for secondary payload.
...
This is a mandatory field in the generated payload.
Bug: 35724498
Test: Generate OTA with --include_secondary. Check the generation
command for secondary payload.
Change-Id: Ib2e25cc020e294eae5a4be36d6dca297432804b8
2018-02-13 14:17:17 -08:00
Tao Bao
d1239cd452
Merge "releasetools: Specify SWITCH_SLOT_ON_REBOOT for secondary payload." am: 4f0b725439
am: 78eef74e03
...
am: 55e571f0b6
Change-Id: I0bb607e9ad51dd8624493a82c3d5c2b2167abd43
2018-02-13 22:12:24 +00:00
Tao Bao
55e571f0b6
Merge "releasetools: Specify SWITCH_SLOT_ON_REBOOT for secondary payload." am: 4f0b725439
...
am: 78eef74e03
Change-Id: I02007c63b6a7398afe8b5304e48c01589842a876
2018-02-13 22:06:40 +00:00
Tao Bao
78eef74e03
Merge "releasetools: Specify SWITCH_SLOT_ON_REBOOT for secondary payload."
...
am: 4f0b725439
Change-Id: Ic027da8aaab2f3d3034255a6726fd3a55063f647
2018-02-13 22:02:21 +00:00
Tao Bao
9452d84b97
Merge "releasetools: Allow generating BBOTA for images with shared blocks."
2018-02-13 21:53:25 +00:00
Tao Bao
6392e05813
Merge "releasetools: Remove the unconditional fallback to bsdiff."
2018-02-13 21:53:17 +00:00
Adam Seaton
312d7e7a3c
[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev
...
Bug:73240847
2018-02-13 21:40:38 +00:00
Christopher Ferris
649b8c1127
Add libc_malloc_hook to list of libraries.
...
Bug: 30561479
Test: Build from scratch and verify the library is present.
Change-Id: I53f30d694cff202ffc93491485ed3c845de07862
(cherry picked from commit 8c70d4de97
)
2018-02-13 13:38:26 -08:00
Christopher Ferris
f7352709ef
Merge "Add libc_malloc_hook to list of libraries."
2018-02-13 21:21:32 +00:00
Pirama Arumuga Nainar
9c62fef547
Merge "Pass PGO_ADDITIONAL_PROFILE_DIRS to soong" am: 73e886ec62
am: 48fa1a2d87
...
am: 8aaf650a40
Change-Id: I9ef128d1598e5f614e2107b61721202f7f911483
2018-02-13 21:15:18 +00:00