Commit Graph

42554 Commits

Author SHA1 Message Date
Mathieu Chartier ad5321a48a Merge changes Iba0c3893,Icf3039ef am: dc9f2de809 am: 0f6b16580c
am: a4f424f652  -s ours

Change-Id: I6ccfa31c31e756ef4c31a19124f0ca83e8b8f10e
2018-01-17 21:40:36 +00:00
Mathieu Chartier a4f424f652 Merge changes Iba0c3893,Icf3039ef am: dc9f2de809
am: 0f6b16580c

Change-Id: I10f05d01d73f049cd6e6fa2955817cfd44091836
2018-01-17 21:38:30 +00:00
Mathieu Chartier 0f6b16580c Merge changes Iba0c3893,Icf3039ef
am: dc9f2de809

Change-Id: I4596ef79ca88e29e96995d6f401a6fada77c6174
2018-01-17 21:36:36 +00:00
Mathieu Chartier dc9f2de809 Merge changes Iba0c3893,Icf3039ef
* changes:
  Don't default my_use_profile_for_boot_image to true for PDK builds
  Enable profile based boot image by default
2018-01-17 21:25:09 +00:00
Tao Bao 7215d15542 Merge "releasetools: Add a note for the ZipInfo._decodeExtra() workaround." am: 65c90ca5b9 am: e88b90a9ad
am: 221df77fda

Change-Id: I49c4182dc2f4d511c6fcb176e8f6ce1c91c849c9
2018-01-17 20:10:51 +00:00
Tao Bao 221df77fda Merge "releasetools: Add a note for the ZipInfo._decodeExtra() workaround." am: 65c90ca5b9
am: e88b90a9ad

Change-Id: I8e099aaeae0b5b5221ea4281f4fd9693bb713d66
2018-01-17 20:08:15 +00:00
Tao Bao e88b90a9ad Merge "releasetools: Add a note for the ZipInfo._decodeExtra() workaround."
am: 65c90ca5b9

Change-Id: I408616db5d1de246280aaf7edc457714ed149773
2018-01-17 20:05:43 +00:00
Treehugger Robot 65c90ca5b9 Merge "releasetools: Add a note for the ZipInfo._decodeExtra() workaround." 2018-01-17 19:53:36 +00:00
Tao Bao d32e78fd3c releasetools: Add a note for the ZipInfo._decodeExtra() workaround.
Test: N/A
Change-Id: I9e84fc27230182f17c2fda0df57a2c149281dcda
2018-01-17 10:10:00 -08:00
Mathieu Chartier 8fd29b3653 Don't default my_use_profile_for_boot_image to true for PDK builds
This causes an unsatisfiable dependency on frameworks/base.

Bug: 67663308
Test: make

(cherry-picked from commit 83bae866e6)

Change-Id: Iba0c3893b49386591f84eb893abf0b577b9716a0
Merged-In: I06e45e8ca66ab6547bf1df25119dda80d44e50f6
2018-01-16 20:02:27 -08:00
Mathieu Chartier ce94494b93 Enable profile based boot image by default
Use profile based boot image instead of the compiled classes version.

Results using profile from ag/2815407
Storage savings:
Boot art+vdex+oat size: 78305556->61539326 (-17MB)

New system server profile has more methods (1.5MB -> 4MB oat) since it
has more coverage from use cases.

Ram savings (sample averages for CUJ test):
Average PSS of 3 runs (~100 samples total):
.Boot_vdex: 9359K -> 9902K
.oat_mmap: 21857K -> 13372K
.Heap: 29779K -> 29483K
.Boot_art: 15736K -> 18096K
.LinearAlloc: 9112K -> 8965K
Total PSS: 85846K -> 79819K (-6MB)

Average pages read from flash (512MB device) for CUJ tests (3 samples):
1508MB -> 1183MB

Bug: 37966211
Test: make and flash

(cherry-picked from commit bf9023ae7a)

Change-Id: Icf3039ef871b68d806ef7b7c8ad2220c3a37ce90
Merged-In: Id8f9b08490a50e2ccf39e8acc00b0c4e8ec782b0
2018-01-16 20:02:18 -08:00
Tao Bao 058b7e157e Merge "releasetools: Consolidate the codes that generate metadata dict." am: 676c20f285 am: efbd0f881c
am: ffd8f6e439

Change-Id: Ic389d6c246e26719e9ada448b8f64d35a3da42fd
2018-01-17 02:13:41 +00:00
Tao Bao ffd8f6e439 Merge "releasetools: Consolidate the codes that generate metadata dict." am: 676c20f285
am: efbd0f881c

Change-Id: Ic47fdf387ed31ad5da3e1392be5d8f5511e31cb3
2018-01-17 02:04:32 +00:00
Tao Bao efbd0f881c Merge "releasetools: Consolidate the codes that generate metadata dict."
am: 676c20f285

Change-Id: I1b3d233b199efc03d32b9a1d17389982cb95157e
2018-01-17 01:56:01 +00:00
Tao Bao 676c20f285 Merge "releasetools: Consolidate the codes that generate metadata dict." 2018-01-17 01:46:07 +00:00
Tao Bao df3a48b43e releasetools: Consolidate the codes that generate metadata dict.
Now they (A/B, non-A/B full and non-A/B incremental) share the same
code. Also add tests for the newly added function.

Test: python -m unittest test_ota_from_target_files
Test: Build A/B and non-A/B packages respectively.
Change-Id: I5499dd9c683ac1a18d8a24f21ff8845fe69f343e
2018-01-16 15:34:27 -08:00
Paul Duffin fa7f2ad5b3 Remove org.apache.http.legacy from bootclasspath
Bug: 18027885
Test: build, flash and cts/tests/signature/runSignatureTests.sh
Change-Id: I4a2be98c8eb54795453e332efbd45b060ef98f82
2018-01-13 09:41:29 +00:00
Sen Jiang 274945a426 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev am: 258f04a556 -s ours am: 478e5c3ff4 -s ours am: 2b7db24048 -s ours am: 289910cb63 -s ours am: 52eb6cbd46 -s ours am: 2d9cfe30f8 -s ours am: 614eece356 -s ours am: dff57d940f -s ours
am: 5f670877ec  -s ours

Change-Id: I5bf578eb9cb2c34d7e6aa475692ddb3d34aafda3
2018-01-13 03:45:48 +00:00
Tao Bao 05c9e29764 Specify --max_timestamp when calling brillo_update_payload. am: d364541fb9 -s ours am: c12bdb2ed5 -s ours am: 0f3e3ddf2c -s ours am: 4008f976e7 -s ours am: 1fe2869558 -s ours am: 9da9c4c001 -s ours am: 4ea0dd06a3 -s ours am: 9042ce5cb1 -s ours
am: 4fc409021a  -s ours

Change-Id: I18283912141ee985770594aa86eebbaf583b73a8
2018-01-13 03:43:30 +00:00
Sen Jiang 5f670877ec Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev am: 258f04a556 -s ours am: 478e5c3ff4 -s ours am: 2b7db24048 -s ours am: 289910cb63 -s ours am: 52eb6cbd46 -s ours am: 2d9cfe30f8 -s ours am: 614eece356 -s ours
am: dff57d940f  -s ours

Change-Id: I32ed19331d00cd379ebc83369bce18ae4a2b3717
2018-01-13 03:34:16 +00:00
Tao Bao 4fc409021a Specify --max_timestamp when calling brillo_update_payload. am: d364541fb9 -s ours am: c12bdb2ed5 -s ours am: 0f3e3ddf2c -s ours am: 4008f976e7 -s ours am: 1fe2869558 -s ours am: 9da9c4c001 -s ours am: 4ea0dd06a3 -s ours
am: 9042ce5cb1  -s ours

Change-Id: Ic5e23bcee4cd13fd4a09220792af17496aa03cda
2018-01-13 03:32:48 +00:00
Tianjie Xu c6d7fc50c1 Merge "Iterate through the sorted file map when finding transfers" am: a7229a08b7 am: 0541a6a556
am: 5ed32ce7a0

Change-Id: I3e5a5985e98dfd3371591b5168bf846d7e5d12ac
2018-01-13 01:03:47 +00:00
Sen Jiang dff57d940f Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev am: 258f04a556 -s ours am: 478e5c3ff4 -s ours am: 2b7db24048 -s ours am: 289910cb63 -s ours am: 52eb6cbd46 -s ours am: 2d9cfe30f8 -s ours
am: 614eece356  -s ours

Change-Id: Ibdac8e0e136de0ccdf5f8a1e435211ea35c82c84
2018-01-13 00:59:39 +00:00
Tao Bao 9042ce5cb1 Specify --max_timestamp when calling brillo_update_payload. am: d364541fb9 -s ours am: c12bdb2ed5 -s ours am: 0f3e3ddf2c -s ours am: 4008f976e7 -s ours am: 1fe2869558 -s ours am: 9da9c4c001 -s ours
am: 4ea0dd06a3  -s ours

Change-Id: I543238f997f715cec7cf61cfbfc07a07eea8f72c
2018-01-13 00:57:43 +00:00
Sen Jiang 614eece356 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev am: 258f04a556 -s ours am: 478e5c3ff4 -s ours am: 2b7db24048 -s ours am: 289910cb63 -s ours am: 52eb6cbd46 -s ours
am: 2d9cfe30f8  -s ours

Change-Id: I17f29cb5fde8191af48786ab6500bb473fdd4882
2018-01-13 00:53:26 +00:00
Tao Bao 4ea0dd06a3 Specify --max_timestamp when calling brillo_update_payload. am: d364541fb9 -s ours am: c12bdb2ed5 -s ours am: 0f3e3ddf2c -s ours am: 4008f976e7 -s ours am: 1fe2869558 -s ours
am: 9da9c4c001  -s ours

Change-Id: I9e37ef84c51cc04f6ebd7c33c71601481c763723
2018-01-13 00:51:29 +00:00
Tianjie Xu 5ed32ce7a0 Merge "Iterate through the sorted file map when finding transfers" am: a7229a08b7
am: 0541a6a556

Change-Id: Idd384a1a089dc05a329b0e5e640d9cd4481e1ef7
2018-01-13 00:51:27 +00:00
Sen Jiang 2d9cfe30f8 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev am: 258f04a556 -s ours am: 478e5c3ff4 -s ours am: 2b7db24048 -s ours am: 289910cb63 -s ours
am: 52eb6cbd46  -s ours

Change-Id: I1ce0c175236164eef49b9dc593e53c6e2ef34190
2018-01-13 00:45:04 +00:00
Tao Bao 9da9c4c001 Specify --max_timestamp when calling brillo_update_payload. am: d364541fb9 -s ours am: c12bdb2ed5 -s ours am: 0f3e3ddf2c -s ours am: 4008f976e7 -s ours
am: 1fe2869558  -s ours

Change-Id: I584bde943007b3cf6f00fe15bcd3a71fc8bb3025
2018-01-13 00:42:53 +00:00
Tianjie Xu 0541a6a556 Merge "Iterate through the sorted file map when finding transfers"
am: a7229a08b7

Change-Id: I736816c3f139635b11e8c7c6d02f06c96a455454
2018-01-13 00:40:26 +00:00
Sen Jiang 52eb6cbd46 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev am: 258f04a556 -s ours am: 478e5c3ff4 -s ours am: 2b7db24048 -s ours
am: 289910cb63  -s ours

Change-Id: I75be57c830552182f5f8a8c61acf78d7b58c7848
2018-01-13 00:38:18 +00:00
Tao Bao 1fe2869558 Specify --max_timestamp when calling brillo_update_payload. am: d364541fb9 -s ours am: c12bdb2ed5 -s ours am: 0f3e3ddf2c -s ours
am: 4008f976e7  -s ours

Change-Id: Ibd8a6c14c8b5b3e97051be748be0ea5417ca88f5
2018-01-13 00:37:15 +00:00
Sen Jiang 289910cb63 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev am: 258f04a556 -s ours am: 478e5c3ff4 -s ours
am: 2b7db24048  -s ours

Change-Id: I4d8de9226362558034be3a166d4a2331827e0c1a
2018-01-13 00:33:45 +00:00
Tao Bao 4008f976e7 Specify --max_timestamp when calling brillo_update_payload. am: d364541fb9 -s ours am: c12bdb2ed5 -s ours
am: 0f3e3ddf2c  -s ours

Change-Id: I40cb316c9fb2de355a1b5f35b43cfb10a3748515
2018-01-13 00:32:42 +00:00
Sen Jiang 2b7db24048 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev am: 258f04a556 -s ours
am: 478e5c3ff4  -s ours

Change-Id: I8eca7a11900777034f094d5e102734f43afc89f2
2018-01-13 00:26:56 +00:00
Tao Bao 0f3e3ddf2c Specify --max_timestamp when calling brillo_update_payload. am: d364541fb9 -s ours
am: c12bdb2ed5  -s ours

Change-Id: I6aa0704e7d54fb07cf2a36e8966a4b8cd50a6b2f
2018-01-13 00:25:27 +00:00
Sen Jiang 478e5c3ff4 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev
am: 258f04a556  -s ours

Change-Id: Id22475574e2ad723c4ebfb79c9b6e727db41f2d8
2018-01-13 00:23:34 +00:00
Tao Bao c12bdb2ed5 Specify --max_timestamp when calling brillo_update_payload.
am: d364541fb9  -s ours

Change-Id: Ibb6acae4edbaa8202de795ce0b0a54b7cff54bbd
2018-01-13 00:19:23 +00:00
Sen Jiang 258f04a556 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dev 2018-01-13 00:13:58 +00:00
Tianjie Xu a7229a08b7 Merge "Iterate through the sorted file map when finding transfers" 2018-01-13 00:01:03 +00:00
Sen Jiang fec0745c29 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843 am: 64e3da49be am: ed62f299b5 am: ea43cfbea1 -s ours am: ca09e189e9 -s ours am: 96df5e3ef8 -s ours am: 51e5c7687c -s ours
am: 9c9f2ad8cb  -s ours

Change-Id: I3bf4d80f1bcc9e3dc14ae5515d7e31bf2ac073aa
2018-01-12 22:58:01 +00:00
Sen Jiang 9c9f2ad8cb Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843 am: 64e3da49be am: ed62f299b5 am: ea43cfbea1 -s ours am: ca09e189e9 -s ours am: 96df5e3ef8 -s ours
am: 51e5c7687c  -s ours

Change-Id: I4df9170b53ff2cb34a2f46cd0b422e3f3fda5824
2018-01-12 22:51:54 +00:00
Sen Jiang 51e5c7687c Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843 am: 64e3da49be am: ed62f299b5 am: ea43cfbea1 -s ours am: ca09e189e9 -s ours
am: 96df5e3ef8  -s ours

Change-Id: I26899877793a29934ab21a8297e22da2e6a23b01
2018-01-12 22:44:25 +00:00
Sen Jiang 96df5e3ef8 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843 am: 64e3da49be am: ed62f299b5 am: ea43cfbea1 -s ours
am: ca09e189e9  -s ours

Change-Id: I1db61e09a632d8587868ec6d28886965cd90dd35
2018-01-12 22:37:56 +00:00
Sen Jiang ca09e189e9 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843 am: 64e3da49be am: ed62f299b5
am: ea43cfbea1  -s ours

Change-Id: Iab2f6f021ff2269475898c6bb362fb67518bf59d
2018-01-12 22:30:20 +00:00
Sen Jiang ea43cfbea1 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843 am: 64e3da49be
am: ed62f299b5

Change-Id: I88c06fb665f834a006b381bc0a2eb02e6303a690
2018-01-12 22:23:21 +00:00
Sen Jiang ed62f299b5 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843
am: 64e3da49be

Change-Id: Ic2e9ff1ec09f81a6fc960663c4e3bca397d7784e
2018-01-12 22:19:08 +00:00
Sen Jiang 64e3da49be Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev
am: 21a26c9843

Change-Id: I656c817338e6b1921213478cdb4f98923561487e
2018-01-12 22:14:30 +00:00
Sen Jiang 21a26c9843 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev 2018-01-12 22:03:43 +00:00
Sen Jiang 18a6db4ef8 Merge "Specify --max_timestamp when calling brillo_update_payload." into oc-dev am: 4378910f30 am: d35542316d am: 9d11ec7bdc -s ours
am: b30ba8ca58  -s ours

Change-Id: I97fbd298427fbe41bde38edf838489b305dfb0ba
2018-01-12 21:21:44 +00:00