Tianjie Xu and android-build-merger
2bd8b55e62
Merge "Create a fallback to install from fuse if mmap fails" am: 5f408dd48a am: 0c666e3d5d
...
am: f6e8941ee9
Change-Id: I7510357cd990cf058c4981a315f8c2cba7d61e5a
2019-07-10 14:08:10 -07:00
Tianjie Xu and android-build-merger
f6e8941ee9
Merge "Create a fallback to install from fuse if mmap fails" am: 5f408dd48a
...
am: 0c666e3d5d
Change-Id: Ifc0bdb1fedc35dd16138706b4112bac21843b4ea
2019-07-10 13:59:32 -07:00
Tianjie Xu and android-build-merger
0c666e3d5d
Merge "Create a fallback to install from fuse if mmap fails"
...
am: 5f408dd48a
Change-Id: Ie8a54863426bb3558600b96c2ef7338eb0171cd3
2019-07-10 13:41:30 -07:00
Tianjie Xu and Gerrit Code Review
5f408dd48a
Merge "Create a fallback to install from fuse if mmap fails"
2019-07-10 17:40:37 +00:00
Justin Yun and android-build-merger
223d8250f5
Merge "Change the symlink to system_ext" am: c992962503 am: 29adb8f0f2
...
am: e4e0fa1d1e
Change-Id: Ib1cd6099db5acc213351d857b238075dba91945f
2019-07-09 22:22:19 -07:00
Justin Yun and android-build-merger
e4e0fa1d1e
Merge "Change the symlink to system_ext" am: c992962503
...
am: 29adb8f0f2
Change-Id: I4b5e05fc6380984c6e1a0fc87fc40f790ee20520
2019-07-09 22:13:17 -07:00
Justin Yun and android-build-merger
29adb8f0f2
Merge "Change the symlink to system_ext"
...
am: c992962503
Change-Id: I3dcd6e9acd6d661eea7c20fbd362761fd7a5011e
2019-07-09 22:05:14 -07:00
Treehugger Robot and Gerrit Code Review
c992962503
Merge "Change the symlink to system_ext"
2019-07-10 04:39:52 +00:00
Tao Bao and android-build-merger
dd23db9412
Merge "recovery_ui: Remove RecoveryUI::last_key." am: 04b4ff695d am: 4324e07a29
...
am: 4b6a9c52ea
Change-Id: I70124176e121858cbe19f79fc351d8c386535b4c
2019-07-09 17:18:57 -07:00
Tao Bao and android-build-merger
4b6a9c52ea
Merge "recovery_ui: Remove RecoveryUI::last_key." am: 04b4ff695d
...
am: 4324e07a29
Change-Id: Ia14ad137f562e59cfd22c5665598e1dbef1b8a87
2019-07-09 16:38:29 -07:00
Justin Yun
ea3c4a4948
Change the symlink to system_ext
...
As system_ext partition will be linked to system/system_ext, update
the path to system/system_ext.
Bug: 134359158
Test: build
Change-Id: I5a49adfe7e045e24bf6dfbf6990a965b8a5e1ce1
2019-07-09 23:33:26 +00:00
Tao Bao and android-build-merger
4324e07a29
Merge "recovery_ui: Remove RecoveryUI::last_key."
...
am: 04b4ff695d
Change-Id: If9f78bd849948a80eaadfbfedc81c4ee3d94ff05
2019-07-09 16:27:30 -07:00
Tao Bao and Gerrit Code Review
04b4ff695d
Merge "recovery_ui: Remove RecoveryUI::last_key."
2019-07-09 22:04:33 +00:00
Tianjie Xu
e521861508
Create a fallback to install from fuse if mmap fails
...
We may fail to memory map the package on 32 bit builds for packages with
2GiB+ size. This cl tries to install the package with fuse when memory map
fails in such cases.
Bug: 127071893
Test: build 32 bit version sailfish, push package and block.map, reboot into recovery with
the corresponding update_package argument.
Change-Id: I5dae4f3e27ccaf8d64ff3657d36f0e75db2330b0
2019-07-09 14:15:18 -07:00
Josh Gao and android-build-merger
a96629a9bb
Merge "minadbd: delete unnecessary fdevent.h include." am: e1701454b2 am: 32aeca8e78
...
am: fe0737868b
Change-Id: I44b9dc695019c1ac6dcd0a08b6102e7251c61142
2019-07-09 14:11:38 -07:00
Josh Gao and android-build-merger
fe0737868b
Merge "minadbd: delete unnecessary fdevent.h include." am: e1701454b2
...
am: 32aeca8e78
Change-Id: I72b99fb7974be9e735cdd8637a4bfaea7afa5618
2019-07-09 13:57:53 -07:00
Josh Gao and android-build-merger
32aeca8e78
Merge "minadbd: delete unnecessary fdevent.h include."
...
am: e1701454b2
Change-Id: Iaca242da9406d1d30e8e9ec4b7958bc11485e9d8
2019-07-09 13:34:38 -07:00
Josh Gao and Gerrit Code Review
e1701454b2
Merge "minadbd: delete unnecessary fdevent.h include."
2019-07-09 20:02:29 +00:00
Tao Bao
1df3ce7ea8
recovery_ui: Remove RecoveryUI::last_key.
...
It's a private member, and the last user has been removed in [1] in
2015.
[1] commit ec28340cf3 ,
https://android-review.googlesource.com/c/platform/bootable/recovery/+/146330
Test: mmma -j bootable/recovery
Change-Id: I65a2370cb20a7b296888425a44a42c8b90abc766
2019-07-09 11:21:18 -07:00
Robin Lee and android-build-merger
0bbe38ed1e
Merge "Add a GetMappedPackageLength to Updater" am: 5135d1f095 am: 254e5c940b
...
am: 2040283730
Change-Id: Id1e061da1299c46814ff125efef3bda613f7f748
2019-07-08 17:47:55 -07:00
Robin Lee and android-build-merger
2040283730
Merge "Add a GetMappedPackageLength to Updater" am: 5135d1f095
...
am: 254e5c940b
Change-Id: Ice3ba9af801cf9dfe4128248367088f090518043
2019-07-08 17:36:32 -07:00
Robin Lee and android-build-merger
254e5c940b
Merge "Add a GetMappedPackageLength to Updater"
...
am: 5135d1f095
Change-Id: I8368d36e84ba29f5f0bc88e89bcb606932d47a7a
2019-07-08 17:11:35 -07:00
Treehugger Robot and Gerrit Code Review
5135d1f095
Merge "Add a GetMappedPackageLength to Updater"
2019-07-08 23:12:38 +00:00
Josh Gao
290322b060
minadbd: delete unnecessary fdevent.h include.
...
Test: treehugger
Change-Id: I09e9850dabbd71bffbe568f240f9fde8b3743e5e
2019-07-08 15:54:33 -07:00
Robin Lee
1cf8eb7559
Add a GetMappedPackageLength to Updater
...
Corresponds to GetMappedPackageAddress.
There is at least one custom device recovery with an extension to copy
the package somewhere else as a backup. Ability to do this was removed
in change ag/955273.
Test: lunch cf_x86_tv-eng; make
Test: atest recovery_unit_test recovery_component_test
Change-Id: I0e61d8a8839c47721874526504ea03b9ca7bafa9
2019-07-08 19:30:11 +02:00
Xin Li and android-build-merger
6859bab6b8
[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master am: 317fc9a2f1 -s ours
...
am: a20839f5d9
Change-Id: Ie3b14f8ec062de99e9f36222a52b0cb7762efcb1
2019-07-02 14:51:45 -07:00
Xin Li and android-build-merger
a20839f5d9
[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master
...
am: 317fc9a2f1 -s ours
am skip reason: subject contains skip directive
Change-Id: I53af26cc12b7f14f235d525fc7d8ed85415bb7b7
2019-07-02 11:59:45 -07:00
Xin Li and android-build-merger
a93c7ebf80
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 457f7ea2fa -s ours
...
am: 779d7d3a3d
Change-Id: Iff02a502acfab68f6e4d68c9fcafbf817901959d
2019-07-02 11:33:55 -07:00
Xin Li and android-build-merger
779d7d3a3d
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
am: 457f7ea2fa -s ours
am skip reason: subject contains skip directive
Change-Id: Ib94a51bbc437761c7bbabb8f45d19102a57489d3
2019-07-02 10:01:34 -07:00
TreeHugger Robot and Android (Google) Code Review
317fc9a2f1
Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master
2019-07-02 07:41:03 +00:00
Tianjie Xu and android-build-merger
efdb35ac41
Merge "Build libimgdiff as a host only library" am: 9341e970ba am: b84b6422fa
...
am: 304c389360
Change-Id: I6a7e5721fdefc37955a7293d359c317471eb0b31
2019-07-01 22:26:40 -07:00
Tianjie Xu and android-build-merger
304c389360
Merge "Build libimgdiff as a host only library" am: 9341e970ba
...
am: b84b6422fa
Change-Id: If463bb7d777c824da38849bca8d715fd31a8e0ee
2019-07-01 22:16:39 -07:00
Tianjie Xu and android-build-merger
b84b6422fa
Merge "Build libimgdiff as a host only library"
...
am: 9341e970ba
Change-Id: I3b3a58f37469b07cc3f6e9eec801eec61e6d897f
2019-07-01 22:06:37 -07:00
Tianjie Xu and Gerrit Code Review
9341e970ba
Merge "Build libimgdiff as a host only library"
2019-07-02 04:27:44 +00:00
Xin Li
457f7ea2fa
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
Bug: 134405016
Change-Id: Ie6d14269d9c86a85ff9e3ef4fc242edd48a58b1b
2019-07-01 20:58:36 +00:00
Tianjie Xu and android-build-merger
676791cea3
Merge "Add unit tests for simulator" am: 4955648c4c am: 143b1d9aed
...
am: ce2b33231e
Change-Id: I92a1cf77649c500169d052f7e3c7defd5f5bb16d
2019-06-28 11:36:27 -07:00
Tianjie Xu and android-build-merger
bbb76d513b
Merge "Rename product_services to system_ext" am: b9f356f581 am: b8e68bf831
...
am: 165fd3916e
Change-Id: I9f279f9c8aaaff08e75a192caf11c8c07116cdd4
2019-06-28 11:36:09 -07:00
Tianjie Xu and android-build-merger
491a6abd01
Merge "Implement ShowMenu for StubRecoveryUI" am: 6f114c72db am: 116152d738
...
am: 378dda080b
Change-Id: Id5d03b893021aaa57f819f70bb3829a22c59c08d
2019-06-28 11:35:50 -07:00
Tianjie Xu and android-build-merger
ce2b33231e
Merge "Add unit tests for simulator" am: 4955648c4c
...
am: 143b1d9aed
Change-Id: I8e77038c2b51751f6b2670aeb898d621a3d4a519
2019-06-28 11:29:26 -07:00
Tianjie Xu and android-build-merger
165fd3916e
Merge "Rename product_services to system_ext" am: b9f356f581
...
am: b8e68bf831
Change-Id: Ica5c92b3fc0d5b5aa4546ea64d845fe00b4a2c25
2019-06-28 11:29:06 -07:00
Tianjie Xu and android-build-merger
378dda080b
Merge "Implement ShowMenu for StubRecoveryUI" am: 6f114c72db
...
am: 116152d738
Change-Id: Ic56b3a6926e13b97863d6bca684d45c75a279b7f
2019-06-28 11:28:47 -07:00
Tianjie Xu and android-build-merger
143b1d9aed
Merge "Add unit tests for simulator"
...
am: 4955648c4c
Change-Id: Ibf7c9092ea71f166c38f7feb644892d96f1da64c
2019-06-28 11:20:51 -07:00
Tianjie Xu and android-build-merger
b8e68bf831
Merge "Rename product_services to system_ext"
...
am: b9f356f581
Change-Id: I3b423d58a295b2cc5f9e2a57bf0e1c97a91e39ad
2019-06-28 11:20:14 -07:00
Tianjie Xu and android-build-merger
116152d738
Merge "Implement ShowMenu for StubRecoveryUI"
...
am: 6f114c72db
Change-Id: Id179a3a82c8d953d62dffc17b6d6d3307a0b9a44
2019-06-28 11:19:43 -07:00
Tianjie Xu
42d7779caf
Build libimgdiff as a host only library
...
Stop building libimgdiff on device because we are only running
patching there.
Test: unit tests pass
Change-Id: I4225c6b52a536617301a64c405e325799a303b40
2019-06-28 11:04:07 -07:00
Tianjie Xu and Gerrit Code Review
4955648c4c
Merge "Add unit tests for simulator"
2019-06-28 17:47:23 +00:00
Tianjie Xu and Gerrit Code Review
b9f356f581
Merge "Rename product_services to system_ext"
2019-06-28 17:45:16 +00:00
Tianjie Xu and Gerrit Code Review
6f114c72db
Merge "Implement ShowMenu for StubRecoveryUI"
2019-06-28 17:45:01 +00:00
Justin Yun
7ba8f18590
Rename product_services to system_ext
...
Bug: 134359158
Test: build and boot
Change-Id: I2ea21a0e528bdbab7d2479b48c73e7f2274ecca5
2019-06-28 16:17:26 +09:00
Tianjie Xu
c3a161e2b8
Add unit tests for simulator
...
Make sure the simulator succeeds executing common non-A/B update
functions.
Bug: 131911365
Test: run unit tests
Change-Id: I520ce6a8827539b88a9e36f9e67eec30d8b586d4
2019-06-27 16:17:05 -07:00