Commit graph

35888 commits

Author SHA1 Message Date
Tao Bao
25643f313a Merge "releasetools: Reduce memory footprint for BBOTA generation." am: 3b1f260205 am: cf82616047
am: a56e7c81e2

Change-Id: Ie0717b0b71b791c1dca826735d31c03a7f4728b1
2017-03-08 17:55:34 +00:00
Tao Bao
a56e7c81e2 Merge "releasetools: Reduce memory footprint for BBOTA generation." am: 3b1f260205
am: cf82616047

Change-Id: I26b65079be3c6e72025e1b5705205bbabdc8fca9
2017-03-08 17:51:05 +00:00
Tao Bao
cf82616047 Merge "releasetools: Reduce memory footprint for BBOTA generation."
am: 3b1f260205

Change-Id: I2b141db33f2a350d5280fb534999052c1ef439b2
2017-03-08 17:48:36 +00:00
Tao Bao
3b1f260205 Merge "releasetools: Reduce memory footprint for BBOTA generation." 2017-03-08 17:43:34 +00:00
Sen Jiang
a142eae939 Merge "Put system_version in target_files.zip" am: 3838ae7e9b am: 75a7a591ba
am: f1f1266fb1

Change-Id: Ib01d1fa4ed6f082fa115f3a0df8f160bb0499e8b
2017-03-08 03:30:42 +00:00
Sen Jiang
f1f1266fb1 Merge "Put system_version in target_files.zip" am: 3838ae7e9b
am: 75a7a591ba

Change-Id: I24c3d03dd9c30ec67dc7f9231da392f811650b20
2017-03-08 03:28:11 +00:00
Sen Jiang
75a7a591ba Merge "Put system_version in target_files.zip"
am: 3838ae7e9b

Change-Id: I357ce185442ec04c028858f187e42187c062a287
2017-03-08 03:25:41 +00:00
Treehugger Robot
3838ae7e9b Merge "Put system_version in target_files.zip" 2017-03-08 03:21:43 +00:00
Sen Jiang
9b8e4ca518 Put system_version in target_files.zip
Bug: 35364984
Test: m dist
Change-Id: I309acb41eb85de239c4c1718e14d9442ca1b0408
(cherry picked from commit cea4d52d2fee19281e660943129e1ad3bdc51fef)
2017-03-07 17:40:27 -08:00
Steven Moreland
a971398525 Merge "Add vnod." am: 2b33e46593 am: 0e1913f4ff
am: f2d838a52e

Change-Id: I0770f7552d1fa9578824d1bb342e8021b3bb089f
2017-03-07 22:08:49 +00:00
Steven Moreland
f2d838a52e Merge "Add vnod." am: 2b33e46593
am: 0e1913f4ff

Change-Id: Ibea28328b1267cbcf7a326ace2c448f8a2b6b792
2017-03-07 22:01:49 +00:00
Steven Moreland
0e1913f4ff Merge "Add vnod."
am: 2b33e46593

Change-Id: I006ef6b77e33f5b6e075fa392326e3e0eebb4610
2017-03-07 21:59:18 +00:00
Treehugger Robot
2b33e46593 Merge "Add vnod." 2017-03-07 21:54:07 +00:00
Steven Moreland
a2e734d786 Add vnod.
Short name for vendorimage-nodeps like snod.

Bug: 33356516
Test: works
Change-Id: Iad62aa5a021d603fa9cebe90f4e28cf09d5d49ae
2017-03-07 12:17:51 -08:00
Tao Bao
b357b83936 Merge "releasetools: Remove the obsolete path in GetImage()." am: 7dc54e9761 am: 438753de24
am: 657ed318d8

Change-Id: Iac897cdeb013ae72b9e0930b2234881280b142dc
2017-03-07 06:30:58 +00:00
Tao Bao
657ed318d8 Merge "releasetools: Remove the obsolete path in GetImage()." am: 7dc54e9761
am: 438753de24

Change-Id: I6edbb699689b39e263ea21ce875a0abf8dc7772c
2017-03-07 06:27:57 +00:00
Tao Bao
438753de24 Merge "releasetools: Remove the obsolete path in GetImage()."
am: 7dc54e9761

Change-Id: I75b60aeb1c8d9264179dd42fd9ce1f78e66c289c
2017-03-07 06:25:58 +00:00
Tao Bao
7dc54e9761 Merge "releasetools: Remove the obsolete path in GetImage()." 2017-03-07 06:20:04 +00:00
Tao Bao
958c691a0e Merge "releasetools: Fix two minor issues with _LoadOemDicts()." am: 0c9e8d87c4 am: cedbcb634f
am: e319d34b21

Change-Id: Ie653cbb3bc5bf4e746a28d6e9620f3a55a9f784f
2017-03-07 02:45:34 +00:00
Tao Bao
e319d34b21 Merge "releasetools: Fix two minor issues with _LoadOemDicts()." am: 0c9e8d87c4
am: cedbcb634f

Change-Id: Id80b3161d864392b249eb3d01ebbd28be16a8e61
2017-03-07 02:43:37 +00:00
Tao Bao
cedbcb634f Merge "releasetools: Fix two minor issues with _LoadOemDicts()."
am: 0c9e8d87c4

Change-Id: I576ed85991a0e25ba2b05458d928bc38149c24b8
2017-03-07 02:41:38 +00:00
Tao Bao
0c9e8d87c4 Merge "releasetools: Fix two minor issues with _LoadOemDicts()." 2017-03-07 00:24:44 +00:00
Tao Bao
7e0f160f30 releasetools: Remove the obsolete path in GetImage().
We must have created the images (system.img, system.map etc) prior to
calling ota_from_target_files.py (added by commit
2e0d8fcf08, into Lollipop).

Remove the obsolete suppport for handling "old" target_files zips that
don't have such images. This simplies the logic for BuildSystem() and
BuildVendor(), which now would only be called by
add_img_to_target_files.py itself.

Test: Generating full and incremental OTAs give the same results, w/ and
      w/o this CL.
Change-Id: I0ea243d09d3378249d7982701ae4ec339b04b7b8
2017-03-06 16:22:44 -08:00
bohu
318905fff4 Emulator: Enable sensors hal support for hidl passthrough mode.
BUG: 35990227
Change-Id: Ia534f87727d59e5497ce46ed413aff739e5cf701
2017-03-07 00:18:28 +00:00
Mathieu Chartier
a37e9057e6 Merge "Fix profile dependency" am: 4d42fef1db am: 52e0317804
am: de8546f31b

Change-Id: I861d1a7a4aa980ae351c4b446daf3baa81f59122
2017-03-06 20:32:51 +00:00
Mathieu Chartier
de8546f31b Merge "Fix profile dependency" am: 4d42fef1db
am: 52e0317804

Change-Id: I6a51e3fc7b1f0c1a0187304be04f21bc1d1355fc
2017-03-06 20:30:20 +00:00
Mathieu Chartier
52e0317804 Merge "Fix profile dependency"
am: 4d42fef1db

Change-Id: Idd14fa4a1e0141558a301b80eb53da0442adf79b
2017-03-06 20:22:20 +00:00
Mathieu Chartier
4d42fef1db Merge "Fix profile dependency" 2017-03-06 19:45:00 +00:00
Mathieu Chartier
fb6c6b38c3 Fix profile dependency
Otherwise it doesn't work for incremental builds.

Bug: 34929159
Bug: 35997300

Test: repo sync && m

Change-Id: I78ead57cf89a9d0f26dbf4f3a225a9357bdca1b3
2017-03-06 11:38:49 -08:00
Tao Bao
ebce697429 releasetools: Fix two minor issues with _LoadOemDicts().
The first one in WriteVerifyPackage() is mismatching function parameters
that can be trivially fixed.

The other one is in WriteABOTAPackageWithBrilloScript(), where we don't
have edify script instance.

Test: `pylint --rcfile=pylintrc ota_from_target_files.py`.
Change-Id: Ie238ef5b296dfe9e725b61376992447b662d2376
2017-03-06 10:29:13 -08:00
Tao Bao
da12392738 Merge "Revert "Revert "releasetools: Use pattern filter when unzipping.""" am: 8e02284362 am: 85f8de467a
am: 654e4f4c77

Change-Id: I75e8a5111c321b8ecda183f758060a4b59bd1e62
2017-03-06 16:57:37 +00:00
Tao Bao
654e4f4c77 Merge "Revert "Revert "releasetools: Use pattern filter when unzipping.""" am: 8e02284362
am: 85f8de467a

Change-Id: I56d3dee99e7f33c5c1e5efd23776cf2106e7d63d
2017-03-06 16:54:06 +00:00
Tao Bao
85f8de467a Merge "Revert "Revert "releasetools: Use pattern filter when unzipping."""
am: 8e02284362

Change-Id: I9919e6c46d500523d096afc77f2bcc1fb4caabd4
2017-03-06 16:50:37 +00:00
Tao Bao
183e56e83d releasetools: Reduce memory footprint for BBOTA generation.
The major issue with the existing implementation is unnecessarily
holding too much data in memory, such as HashBlocks() which first reads
in *all* the data to a list before hashing. We can leverage generator
functions to stream such operations.

This CL makes the following changes to reduce the peak memory use.
 - Adding RangeSha1() and WriteRangeDataToFd() to Image classes. These
   functions perform the operations on-the-fly.
 - Caching the computed SHA-1 values for a Transfer instance.

As a result, this CL reduces the peak memory use by ~80% (e.g. reducing
from 5.85GB to 1.16GB for the same incremental, as shown by "Maximum
resident set size" from `/usr/bin/time -v`). It also effectively
improves the (package generation) performance by ~30%.

Bug: 35768998
Bug: 32312123
Test: Generating the same incremental w/ and w/o the CL give identical
      output packages.
Change-Id: Ia5c6314b41da73dd6fe1dbe2ca81bbd89b517cec
2017-03-06 08:46:30 -08:00
Tao Bao
8e02284362 Merge "Revert "Revert "releasetools: Use pattern filter when unzipping.""" 2017-03-06 16:45:26 +00:00
Tao Bao
6b0b2f9db0 Revert "Revert "releasetools: Use pattern filter when unzipping.""
This reverts commit a7316ce094.

This CL differs from the original CL by not unzipping RADIO/*. This is
because: a) AOSP targets don't have RADIO/ entries in the TF.zip; b)
we're not using the unzipped RADIO files (but reading them from the zip
files directly) - checked all the device-specific releasetools for
angler, bullhead, ryu, shamu, volantis, fugu, marlin and sailfish.

Test: `m dist` with AOSP targets (tested fugu and bullhead).
Change-Id: I4d0c67214ddd6202fc27c71bb79f52b5f4d40c64
2017-03-05 13:11:42 -08:00
Tao Bao
f9566f38e2 Merge "Revert "releasetools: Use pattern filter when unzipping."" am: 0c3e31c69b am: 6c98ad6c4e
am: a4170833d1

Change-Id: I529f9eb380fc06b08d02be80635f9ac9a9317654
2017-03-05 17:56:19 +00:00
Tao Bao
a4170833d1 Merge "Revert "releasetools: Use pattern filter when unzipping."" am: 0c3e31c69b
am: 6c98ad6c4e

Change-Id: Ide956c794dee147ff5f6cfa6e8afc06f3c8b49a1
2017-03-05 17:52:48 +00:00
Tao Bao
6c98ad6c4e Merge "Revert "releasetools: Use pattern filter when unzipping.""
am: 0c3e31c69b

Change-Id: Id85576e87048f8828b5c0bf8ab3b6ebcd118002a
2017-03-05 17:49:17 +00:00
Tao Bao
0c3e31c69b Merge "Revert "releasetools: Use pattern filter when unzipping."" 2017-03-05 17:44:58 +00:00
Tao Bao
a7316ce094 Revert "releasetools: Use pattern filter when unzipping."
This reverts commit aa3a04f19d.

Reason for revert: Some AOSP targets don't include RADIO/ in the TF.zip. We may possibly skip unzipping RADIO/, or by always creating a dummy RADIO folder in TF.zip. Revert this CL for now.

Change-Id: I8e90d322706a4fe82129bdfab5ffa1eab989c648
2017-03-05 17:43:33 +00:00
Tao Bao
ee5f10acab Merge "Change the default parameter values in common.MakeTempFile()." am: cc63bc3a91 am: 2b7a043a06
am: a21cff6280

Change-Id: I048ca3c7b4bcd5fa24cb1b7b903ebb60cc7fac47
2017-03-05 17:12:45 +00:00
Tao Bao
a21cff6280 Merge "Change the default parameter values in common.MakeTempFile()." am: cc63bc3a91
am: 2b7a043a06

Change-Id: I9e33d0e237040c21492694cef588cab5de78fcda
2017-03-05 17:09:13 +00:00
Tao Bao
2b7a043a06 Merge "Change the default parameter values in common.MakeTempFile()."
am: cc63bc3a91

Change-Id: Ie972c520ec809eb2f4ac3a47526a5f135b9d6f97
2017-03-05 17:05:14 +00:00
Tao Bao
220bdee570 Merge "releasetools: Use pattern filter when unzipping." am: 76f038a63c am: e2309ba525
am: adf0881dc5

Change-Id: Icb68cb9205f9da4fd8fdb8e334c819d69a5abb6c
2017-03-05 17:01:44 +00:00
Tao Bao
cc63bc3a91 Merge "Change the default parameter values in common.MakeTempFile()." 2017-03-05 17:00:38 +00:00
Tao Bao
adf0881dc5 Merge "releasetools: Use pattern filter when unzipping." am: 76f038a63c
am: e2309ba525

Change-Id: Ide81c0015c4b840140f35311cc3195c61babd9c2
2017-03-05 16:58:14 +00:00
Tao Bao
e2309ba525 Merge "releasetools: Use pattern filter when unzipping."
am: 76f038a63c

Change-Id: I538c42fe0ffab9bdc5d3bbfbdc5953083566932e
2017-03-05 16:54:43 +00:00
Tao Bao
76f038a63c Merge "releasetools: Use pattern filter when unzipping." 2017-03-05 16:49:21 +00:00
Howard Chen
9c5d687331 Merge "Support kernel modules in vendor, recovery images" am: 2f6c2b44d0 am: 8fafc4a830
am: 246e093ba8  -s ours

Change-Id: I8bcdc130f5ea4590a9fa5419c06163060aa8615d
2017-03-04 03:47:35 +00:00