We need a merge from AOSP to get the latest changes. This is going to be painful though since it might required some uprevs in libchrome and libbrillo.
The following revision refers to this bug: https://chromium.googlesource.com/aosp/platform/external/libbrillo/+/bdfc8281d8e94e47bddf2f9f7401bcdb3beb80ad commit bdfc8281d8e94e47bddf2f9f7401bcdb3beb80ad Author: Aaron Wood <aaronwood@google.com> Date: Fri Mar 02 21:25:19 2018 libbrillo: Bitwise operator templates for enums When an enum is used to define bitwise flags that are meant to be combined (FLAG_ONE | FLAG_TWO), the resultant value needs to be cast back to the enum type in order to be stored in a variable of the same type as the enum (as the result is a value of underlying_type of the enum). This adds a macro that allows templated bitwise operators to be defined so that the enumerators can be used more cleanly in code, while preserving type-safety. BUG=b:37434548 BUG= chromium:815356 TEST=unittests (cherry picked from commit 1d20c7da0b8833ffda7dfff2066205ea1af7e771) Change-Id: I35b2a5b99fe87d63f1d0a0c01fba03e7b2f9a58b Reviewed-on: https://chromium-review.googlesource.com/941982 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Amin Hassani <ahassani@chromium.org> [modify] https://crrev.com/bdfc8281d8e94e47bddf2f9f7401bcdb3beb80ad/libbrillo.gypi [modify] https://crrev.com/bdfc8281d8e94e47bddf2f9f7401bcdb3beb80ad/Android.mk [add] https://crrev.com/bdfc8281d8e94e47bddf2f9f7401bcdb3beb80ad/brillo/enum_flags.h [add] https://crrev.com/bdfc8281d8e94e47bddf2f9f7401bcdb3beb80ad/brillo/enum_flags_unittest.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/56e92fdb5c1caae2a15b35a9028ece726bee546a commit 56e92fdb5c1caae2a15b35a9028ece726bee546a Author: Amin Hassani <ahassani@google.com> Date: Tue Mar 13 20:05:05 2018 autoupdate: blacklist ebuilds We want to do an AOSP merge. So we need to blacklist: - update_engine - update_engine-client - update_payload BUG= chromium:815356 TEST=none Change-Id: Id5448a3cb0a7ff536d8748f1edbe62368ad190a7 Reviewed-on: https://chromium-review.googlesource.com/959348 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> [modify] https://crrev.com/56e92fdb5c1caae2a15b35a9028ece726bee546a/chromeos-base/update_payload/update_payload-0.0.1-r49.ebuild [modify] https://crrev.com/56e92fdb5c1caae2a15b35a9028ece726bee546a/chromeos-base/update_payload/update_payload-9999.ebuild [modify] https://crrev.com/56e92fdb5c1caae2a15b35a9028ece726bee546a/chromeos-base/update_engine-client/update_engine-client-9999.ebuild [modify] https://crrev.com/56e92fdb5c1caae2a15b35a9028ece726bee546a/chromeos-base/update_engine/update_engine-0.0.3-r3162.ebuild [modify] https://crrev.com/56e92fdb5c1caae2a15b35a9028ece726bee546a/chromeos-base/update_engine/update_engine-9999.ebuild [modify] https://crrev.com/56e92fdb5c1caae2a15b35a9028ece726bee546a/chromeos-base/update_engine-client/update_engine-client-0.0.1-r1322.ebuild
The following revision refers to this bug: https://chromium.googlesource.com/aosp/platform/system/update_engine/+/3e0b22afa4446f966bef15d0a513e3e9ab663d22 commit 3e0b22afa4446f966bef15d0a513e3e9ab663d22 Author: Amin Hassani <ahassani@google.com> Date: Mon Mar 12 21:37:30 2018 Merge remote-tracking branch 'remotes/cros/update_engine_aosp_merge' In the follow up CLs we have to Reland: eaad5d0f17a1b9d5652a350e1c785c7c5368cb54 Do not merge to AOSP: Fixes the link to brillo-clang-format in CrOS 740efad439e57e71d8d459c366edea3a90b19576 Reboot even if a system update is not available. 4b0d6032cbb86ce488c03b31936cda31283f97e3 Add functions to allow update over cellular (including tethered connection) 840703a4cc77228e2606f45665ae3a4bd75ff7dd Fix update over cellular network on guest account Because they have been reverted in cros/upstream branch. Also we have to partially revert: 2b9d2417722cd4052b0e22494886f93c5b4ef042 update_engine: Update libchrome APIS to r456626. Because we have not upreved libchrome BUG= chromium:815356 TEST=unittests TEST=cl with squashfs merge passes Change-Id: I0ec7f3fe3fd278ef1214868b42d3eb126ebeefe2
The following revision refers to this bug: https://chromium.googlesource.com/aosp/platform/system/update_engine/+/e79eab633e42036e5aab62a69f31347127f136d1 commit e79eab633e42036e5aab62a69f31347127f136d1 Author: Amin Hassani <ahassani@google.com> Date: Sat Mar 17 01:31:16 2018 update_engine: guarded 740efad for only android 740efad439e57e71d8d459c366edea3a90b19576: Reboot even if a system update is not available. The above patch removes a part of code in ChromeOS, but the Android still needs it. That patch has been reverted in AOSP. This CL guards that piece of code to be built on non-chromeos builds so there would be no need for reverting it again in android when merging back and forth. BUG= chromium:815356 TEST=unittests Change-Id: Ieb8f246d9dba0bd2b7ee7ecc4e3b7823249b3599 Reviewed-on: https://chromium-review.googlesource.com/965265 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Sen Jiang <senj@chromium.org> [modify] https://crrev.com/e79eab633e42036e5aab62a69f31347127f136d1/update_attempter.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/efec4469e39c060417d2576c1e0f0b0b2cd2a418 commit efec4469e39c060417d2576c1e0f0b0b2cd2a418 Author: Amin Hassani <ahassani@chromium.org> Date: Mon Mar 19 21:18:56 2018 autoupdate: unblacklist ebuilds This patch unblacklist the autoupdate ebuilds to let the CQ test the new update_engine merges. Bug: chromium:815356 TEST= precq CQ-DEPEND=CL:965267 Change-Id: Ia872f89cd4c890044ce62b2b3a2f5a291cc8e73b Reviewed-on: https://chromium-review.googlesource.com/965464 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> [modify] https://crrev.com/efec4469e39c060417d2576c1e0f0b0b2cd2a418/chromeos-base/update_payload/update_payload-0.0.1-r49.ebuild [modify] https://crrev.com/efec4469e39c060417d2576c1e0f0b0b2cd2a418/chromeos-base/update_payload/update_payload-9999.ebuild [modify] https://crrev.com/efec4469e39c060417d2576c1e0f0b0b2cd2a418/chromeos-base/update_engine-client/update_engine-client-9999.ebuild [modify] https://crrev.com/efec4469e39c060417d2576c1e0f0b0b2cd2a418/chromeos-base/update_engine/update_engine-0.0.3-r3162.ebuild [modify] https://crrev.com/efec4469e39c060417d2576c1e0f0b0b2cd2a418/chromeos-base/update_engine/update_engine-9999.ebuild [modify] https://crrev.com/efec4469e39c060417d2576c1e0f0b0b2cd2a418/chromeos-base/update_engine-client/update_engine-client-0.0.1-r1322.ebuild
The following revision refers to this bug: https://chromium.googlesource.com/aosp/platform/system/update_engine/+/71818c8409812c5a08124627c19aa8ea0625a72e commit 71818c8409812c5a08124627c19aa8ea0625a72e Author: Amin Hassani <ahassani@google.com> Date: Mon Mar 19 21:18:54 2018 Partially Revert 2b9d241 2b9d2417722cd4052b0e22494886f93c5b4ef042 update_engine: Update libchrome APIS to r456626. The above commit changes the libchrome API used in update_engine to r456626. But the libchrome has not been upreved fully in the CrOS yet with the exception of some changes represented in UE like CL:882543. So, now we need to revert the changes partially untill the libchrome is updated. BUG= chromium:815356 TEST=unittests, precq Change-Id: If2207f0672c7b9f6dab84e676d9fb8423a047372 Reviewed-on: https://chromium-review.googlesource.com/965266 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Ben Chan <benchan@chromium.org> Reviewed-by: Sen Jiang <senj@chromium.org> [modify] https://crrev.com/71818c8409812c5a08124627c19aa8ea0625a72e/update_manager/real_time_provider.cc [modify] https://crrev.com/71818c8409812c5a08124627c19aa8ea0625a72e/update_attempter_unittest.cc [modify] https://crrev.com/71818c8409812c5a08124627c19aa8ea0625a72e/common/subprocess_unittest.cc [modify] https://crrev.com/71818c8409812c5a08124627c19aa8ea0625a72e/common/utils_unittest.cc [modify] https://crrev.com/71818c8409812c5a08124627c19aa8ea0625a72e/omaha_request_action_unittest.cc [modify] https://crrev.com/71818c8409812c5a08124627c19aa8ea0625a72e/test_http_server.cc [modify] https://crrev.com/71818c8409812c5a08124627c19aa8ea0625a72e/update_manager/real_updater_provider_unittest.cc [modify] https://crrev.com/71818c8409812c5a08124627c19aa8ea0625a72e/update_manager/real_shill_provider_unittest.cc [modify] https://crrev.com/71818c8409812c5a08124627c19aa8ea0625a72e/payload_consumer/postinstall_runner_action_unittest.cc [modify] https://crrev.com/71818c8409812c5a08124627c19aa8ea0625a72e/update_manager/real_time_provider_unittest.cc [modify] https://crrev.com/71818c8409812c5a08124627c19aa8ea0625a72e/update_manager/update_manager_unittest.cc [modify] https://crrev.com/71818c8409812c5a08124627c19aa8ea0625a72e/common/http_fetcher_unittest.cc [modify] https://crrev.com/71818c8409812c5a08124627c19aa8ea0625a72e/payload_consumer/filesystem_verifier_action_unittest.cc [modify] https://crrev.com/71818c8409812c5a08124627c19aa8ea0625a72e/proxy_resolver_unittest.cc [modify] https://crrev.com/71818c8409812c5a08124627c19aa8ea0625a72e/payload_consumer/download_action_unittest.cc [modify] https://crrev.com/71818c8409812c5a08124627c19aa8ea0625a72e/update_attempter.cc
The following revision refers to this bug: https://chromium.googlesource.com/aosp/platform/system/update_engine/+/421ff33ee91186014c37abc7b6d8fa075074d894 commit 421ff33ee91186014c37abc7b6d8fa075074d894 Author: Weidong Guo <weidongg@chromium.org> Date: Mon Mar 19 21:18:55 2018 Reland update over cellular changes This merge cherrypicks two commits that was reverted in an AOSP git merge. 4b0d6032cbb86ce488c03b31936cda31283f97e3 Add functions to allow update over cellular (including tethered connection) 840703a4cc77228e2606f45665ae3a4bd75ff7dd Fix update over cellular network on guest account Handled multi-package response. Ran clang-format which fixed a lot of issues in those two CLs. BUG= chromium:815356 TEST=unittests, precq Change-Id: I54b6763c4c54755272531b558ed7628ceb0fc6c7 Reviewed-on: https://chromium-review.googlesource.com/965267 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Ben Chan <benchan@chromium.org> [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/dbus_service.h [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/connection_manager_interface.h [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/omaha_request_action_unittest.cc [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/common_service.h [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/common/error_code_utils.cc [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/binder_bindings/android/brillo/IUpdateEngine.aidl [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/dbus_bindings/org.chromium.UpdateEngineInterface.dbus-xml [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/connection_manager_android.cc [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/omaha_request_action.h [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/metrics_utils.cc [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/mock_connection_manager.h [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/common_service.cc [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/binder_service_brillo.cc [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/update_status_utils.cc [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/dbus_service.cc [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/update_attempter.cc [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/common/constants.cc [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/connection_manager.cc [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/connection_manager.h [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/connection_manager_unittest.cc [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/client_library/include/update_engine/update_status.h [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/common/constants.h [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/payload_state.cc [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/update_manager/chromeos_policy.cc [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/common/error_code.h [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/UpdateEngine.conf [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/omaha_request_action.cc [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/connection_manager_android.h [modify] https://crrev.com/421ff33ee91186014c37abc7b6d8fa075074d894/binder_service_brillo.h
New merge is coming.
Comment 1 by bugdroid1@chromium.org
, Mar 2 2018