OSDN Git Service

Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""
authorTao Bao <tbao@google.com>
Tue, 15 Mar 2016 20:20:19 +0000 (13:20 -0700)
committerTao Bao <tbao@google.com>
Tue, 15 Mar 2016 20:28:49 +0000 (13:28 -0700)
commit3e30d97dde42416a1762c161ed7217d4e7ebf2c6
treea75fde345037b70646dfbc22110dbe1e90b9e206
parent3c37889299b7ab8df676fed7b8157484a7e5315a
Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""

This CL fixes the bug in [1] (copy-paste error) and reenables it.

We need to handle a special case that an OTA goes from a source build
without OEM properties to a target build with those properties (or vice
versa). Add support in OTA scripts to deal the case properly, by a)
using two oem_props variables to handle source and target builds
respectively; b) adjusting the fingerprint/thumbprint assertions to
allow a mix of both.

[1] commit c086370440bb32501da427718a7313f12ec2c841

Change-Id: I98118d77d5a0ff694fa1ee33602b5ee5e048599b
tools/releasetools/edify_generator.py
tools/releasetools/ota_from_target_files.py