Skip to content

Commit 24e1d72

Browse files
gigilibala2Commit Bot
authored and
Commit Bot
committed
update_engine: remove system_id and system_version
These two variables and their use cases was introduced for android, but eventually android abandon it for some other solution. So this are stale now. Also removed the implemnation of ImageProperties for Android as it doesn't seem Android is actually using it. BUG=b:171829801 TEST=unittests Change-Id: Ic793cfa5031d69b5390acefb1b8cd75291708890 Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/2505885 Reviewed-by: Jae Hoon Kim <[email protected]> Reviewed-by: Tianjie Xu <[email protected]> Reviewed-by: Amin Hassani <[email protected]> Tested-by: Amin Hassani <[email protected]> Commit-Queue: Amin Hassani <[email protected]>
1 parent 2fe8432 commit 24e1d72

14 files changed

+1
-444
lines changed

image_properties.h

-4
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,9 @@ struct ImageProperties {
3333
std::string product_id;
3434
// The canary-channel product id.
3535
std::string canary_product_id;
36-
// The system id for the Android Things SoM, empty for Chrome OS.
37-
std::string system_id;
3836

3937
// The product version of this image.
4038
std::string version;
41-
// The system version of this image.
42-
std::string system_version;
4339

4440
// The version of all product components in key values pairs.
4541
std::string product_components;

image_properties_android.cc

-246
This file was deleted.

image_properties_android_unittest.cc

-123
This file was deleted.

omaha_request_action.cc

-5
Original file line numberDiff line numberDiff line change
@@ -865,11 +865,6 @@ bool OmahaRequestAction::ParseParams(OmahaParserData* parser_data,
865865
if (app.id == params_->GetAppId()) {
866866
// this is the app (potentially the only app)
867867
output_object->version = app.manifest_version;
868-
} else if (!params_->system_app_id().empty() &&
869-
app.id == params_->system_app_id()) {
870-
// this is the system app (this check is intentionally skipped if there is
871-
// no system_app_id set)
872-
output_object->system_version = app.manifest_version;
873868
} else if (params_->is_install() &&
874869
app.manifest_version != params_->app_version()) {
875870
LOG(WARNING) << "An app has a different version (" << app.manifest_version

0 commit comments

Comments
 (0)