big biff and Gerrit Code Review
c1ad6c1931
Merge "Pass file_contexts path to e2fsdroid" into android-9.0
2019-05-15 01:04:55 +02:00
big biff and Gerrit Code Review
f816672f9c
Merge "Update help manual in orscmd" into android-9.0
2019-05-14 01:41:33 +02:00
Xin Li
e7a0262c14
DO NOT MERGE - Skip pi-platform-release (PPRL.190505.001) in stage-aosp-master
...
Bug: 132622481
Change-Id: Ic07faa9aa968d11ae8f6b44d548d724fd194e047
2019-05-13 15:56:57 -07:00
Nikolay
29969ec5dd
Update help manual in orscmd
...
Change-Id: I4b2e385637cded40dbb08e0ee8ca7117dbdd67ca
2019-05-12 21:03:35 +01:00
lambdadroid
ead0f49cbb
toolbox: Avoid linking toolbox tools to dd
...
Having the twrp_dd module definition right within the build rules
for the toolbox symlinks causes the toolbox tools (getprop, ...)
to be linked to dd instead of toolbox.
This happens because the symlinks are created using variables
from the "toolbox_recovery" module (e.g. LOCAL_MODULE_STEM).
Those are changed by the twrp_dd module definition.
Move the twrp_dd module definition to the end of the make file
(after the build rules for the symlinks) to fix this.
Fixes https://github.com/omnirom/android_bootable_recovery/issues/257
Change-Id: I44973920898fe8a21bc32d621500fe38f9d1ebdd
2019-05-12 11:54:38 +02:00
Tao Bao and android-build-merger
8ffec8944c
Merge "roots: Remove get_system_root and logical_partitions_mapped." am: ba8f38d741 am: c53856dca7
...
am: fb4f72cb7c
Change-Id: Ib4c2cc6f5f90f1ee59461d52f43a6fcb035bcf03
2019-05-10 21:12:19 -07:00
Tao Bao and android-build-merger
fb4f72cb7c
Merge "roots: Remove get_system_root and logical_partitions_mapped." am: ba8f38d741
...
am: c53856dca7
Change-Id: Ia77b93802de465219587a519d1109aab888c38f0
2019-05-10 18:08:37 -07:00
Tao Bao and android-build-merger
c53856dca7
Merge "roots: Remove get_system_root and logical_partitions_mapped."
...
am: ba8f38d741
Change-Id: I7bc0a5ff9e7709f91fe28f4c9b8d20f5c8d20cf8
2019-05-10 17:40:31 -07:00
Tao Bao and Gerrit Code Review
ba8f38d741
Merge "roots: Remove get_system_root and logical_partitions_mapped."
2019-05-10 23:58:32 +00:00
big biff and Gerrit Code Review
c2a5f7ef66
Merge "language: update Chinese translations" into android-9.0
2019-05-11 01:45:24 +02:00
betaxab
c23f00b90d
language: update Chinese translations
...
Change-Id: Id34055262b7c711a2ee71d97d27503a887d35b76
Signed-off-by: betaxab <betaxab@gmail.com >
2019-05-11 03:45:59 +08:00
Tao Bao
f90d9a102f
roots: Remove get_system_root and logical_partitions_mapped.
...
Test: TreeHugger
Test: Boot into recovery on blueline. Choose "Mount system partition".
Change-Id: Iac475d18ce2415de09dc0bf009ad4cf0383ffede
2019-05-10 10:42:56 -07:00
TreeHugger Robot and Android (Google) Code Review
9848f117d7
Merge "Import translations. DO NOT MERGE"
2019-05-10 08:26:56 +00:00
Xin Li and android-build-merger
a61c8f2e83
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: 343a7dcdd2 -s ours am: 8e7be1faeb -s ours
...
am: 4904e5f06a -s ours
am skip reason: subject contains skip directive
Change-Id: Ib2a71a935ca0a44753331f8778809426fc764b76
2019-05-09 21:22:10 -07:00
Elliott Hughes and android-build-merger
f8053c5857
Merge "Track libziparchive API change." am: 6da27adb0b am: 46fa74623a
...
am: 774a79492a
Change-Id: I8c678857bd4fa6d9a5b227a3931bf919f1896172
2019-05-09 19:22:14 -07:00
Tianjie Xu and android-build-merger
4161a635ce
Merge "Skip hashtree computation during block image verify" am: c046a61d97 am: e945763a5d
...
am: 8876c2d4ab
Change-Id: I3647cd9b5d6e15473778ce3ac7e8c525f8e58ebc
2019-05-09 17:45:33 -07:00
Bill Yi
84efc1ba7d
Import translations. DO NOT MERGE
...
Change-Id: Ia35cdac295a1ce6f8b53638c908c0caf2a97477c
Auto-generated-cl: translation import
2019-05-09 17:26:20 -07:00
Xin Li and android-build-merger
4904e5f06a
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." am: 343a7dcdd2 -s ours
...
am: 8e7be1faeb -s ours
am skip reason: subject contains skip directive
Change-Id: I3c51185cacadca80cfa183ec16b73426c7b9e936
2019-05-09 17:11:52 -07:00
Elliott Hughes and android-build-merger
774a79492a
Merge "Track libziparchive API change." am: 6da27adb0b
...
am: 46fa74623a
Change-Id: I1108099bc7dc4f20856fb611eb2552592ceff759
2019-05-09 16:18:32 -07:00
Tianjie Xu and android-build-merger
8876c2d4ab
Merge "Skip hashtree computation during block image verify" am: c046a61d97
...
am: e945763a5d
Change-Id: Ic732927e67fee9abab74e9ca2df2bbf271228c9e
2019-05-09 16:15:36 -07:00
Xin Li and android-build-merger
8e7be1faeb
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
...
am: 343a7dcdd2 -s ours
am skip reason: subject contains skip directive
Change-Id: Iea7679752ae74ce0d026fe3e58d3d3df88b21739
2019-05-09 15:48:46 -07:00
Xin Li and Gerrit Code Review
343a7dcdd2
Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
2019-05-09 22:05:46 +00:00
Elliott Hughes and android-build-merger
46fa74623a
Merge "Track libziparchive API change."
...
am: 6da27adb0b
Change-Id: Ib261d224fe4b57ead972987466dc30411505aa30
2019-05-09 14:46:26 -07:00
Tianjie Xu and android-build-merger
e945763a5d
Merge "Skip hashtree computation during block image verify"
...
am: c046a61d97
Change-Id: If5934f92768248c79029c3e7e0934b7a2a37c88d
2019-05-09 14:43:49 -07:00
Elliott Hughes and Gerrit Code Review
6da27adb0b
Merge "Track libziparchive API change."
2019-05-09 21:32:52 +00:00
Tianjie Xu and android-build-merger
cac54eaba5
Merge "Add Updater class and remove UpdaterInfo" am: 19737a5b38 am: 93667742fe
...
am: 58c716601e
Change-Id: Ic38dfed8c169516bc0f30acbdf9971b683fea044
2019-05-09 14:06:16 -07:00
Tianjie Xu and Gerrit Code Review
c046a61d97
Merge "Skip hashtree computation during block image verify"
2019-05-09 20:47:57 +00:00
Tianjie Xu and android-build-merger
58c716601e
Merge "Add Updater class and remove UpdaterInfo" am: 19737a5b38
...
am: 93667742fe
Change-Id: I80f09705d083e4566ec4b60ebcf0ef711fe48845
2019-05-09 11:08:05 -07:00
Tianjie Xu
3fda5d6508
Skip hashtree computation during block image verify
...
The hashtree computation is designed to execute after we write all the
bytes to the target block device. And executing the command during block
image verify will almost always fail since we are still on the source
build.
Test: run simulator
Change-Id: If8ebb66739969520367a0815f5f8f89f6fae47cf
2019-05-09 10:58:10 -07:00
Tianjie Xu and android-build-merger
93667742fe
Merge "Add Updater class and remove UpdaterInfo"
...
am: 19737a5b38
Change-Id: If5ec40a583441f54b6bb012cd9f501f14d4f3b86
2019-05-09 10:51:05 -07:00
Tianjie Xu and Gerrit Code Review
19737a5b38
Merge "Add Updater class and remove UpdaterInfo"
2019-05-09 17:33:52 +00:00
Xin Li
a5741b06ef
DO NOT MERGE - Merge Pie Bonito/Sargo into master.
...
Bug: 131756210
Change-Id: Ia8a170576e6473ec4dae90d481e17aa216223e97
2019-05-09 09:27:02 -07:00
Tianjie Xu
58d59129e1
Add Updater class and remove UpdaterInfo
...
The UpdaterInfo class is merely a collection of pointers and POD types.
We can replace it with a Updater class that has the ownership of the
resources. This also makes this class extensible as we plan to add more
functionality in the host simulator.
Bug: 131911365
Test: unit tests pass, run an update on cuttlefish and check last_install
Change-Id: I07ca5963bbee8ae3cb85ccc184464910aa73d4e4
2019-05-08 23:07:04 -07:00
Elliott Hughes
143a03fa03
Track libziparchive API change.
...
Bug: http://b/129068177
Test: treehugger
Change-Id: I618bbcf38914dd81e042e0cfd1976ff26274dc30
2019-05-08 17:28:22 -07:00
big biff and Gerrit Code Review
117c64785b
Merge "NTFS-3G: use newer libfuse-light in pie." into android-9.0
2019-05-09 01:48:45 +02:00
android-build-team Robot
94baa21254
Snap for 5450365 from bd8ed91d04 to pi-platform-release
...
Change-Id: I02180574c059ce8af1f031195ee497540a82cd65
2019-05-07 21:57:33 +00:00
Elliott Hughes and android-build-merger
61600225e9
Merge "Track libziparchive API change." am: 9423d2f6b7 am: 0d24715223
...
am: e76cedf588
Change-Id: Iac7ddaa02c98be75151a87a613688c3f456e2ffa
2019-05-06 19:18:03 -07:00
Elliott Hughes and android-build-merger
e76cedf588
Merge "Track libziparchive API change." am: 9423d2f6b7
...
am: 0d24715223
Change-Id: I1aabd53cfe7a42773d22a6192f89340261d29ff3
2019-05-06 17:39:33 -07:00
Elliott Hughes and android-build-merger
0d24715223
Merge "Track libziparchive API change."
...
am: 9423d2f6b7
Change-Id: I611e235693bd7b060f472280f94e89e2f52a2ea0
2019-05-06 17:14:06 -07:00
Elliott Hughes and Gerrit Code Review
9423d2f6b7
Merge "Track libziparchive API change."
2019-05-06 23:45:16 +00:00
Colin Cross and android-build-merger
a0bad4d22f
Merge "Disable libbootloader_message for darwin" am: 12262d568a am: 5a25636f34
...
am: b0270e043a
Change-Id: I288c4b0a18275e83f4cc0fbe4997252eb595e273
2019-05-06 14:35:11 -07:00
Colin Cross and android-build-merger
b0270e043a
Merge "Disable libbootloader_message for darwin" am: 12262d568a
...
am: 5a25636f34
Change-Id: I5c3052596556bb4ba79cc2382114f1d117de1109
2019-05-06 14:30:07 -07:00
Colin Cross and android-build-merger
5a25636f34
Merge "Disable libbootloader_message for darwin"
...
am: 12262d568a
Change-Id: Ic3016f69893c4f5792f30be1edf341e6d6338297
2019-05-06 14:25:08 -07:00
Treehugger Robot and Gerrit Code Review
12262d568a
Merge "Disable libbootloader_message for darwin"
2019-05-06 21:09:10 +00:00
Elliott Hughes
a86dddbfa5
Track libziparchive API change.
...
Bug: http://b/129068177
Test: treehugger
Change-Id: Ie5b2b0cff087f2e9e65a4e77c187e3173357f3ad
2019-05-06 10:28:14 -07:00
Colin Cross
fb68d38fba
Disable libbootloader_message for darwin
...
libfstab is not built for darwin, don't build libbootloader_message
either.
Bug: 131709594
Test: m PRODUCT-sdk-sdk sdk_repo
Change-Id: I6e3b04f1c3e97d5aa6ac0452bf13e714f8dae437
2019-05-06 09:49:00 -07:00
android-build-team Robot
55a2fe53b6
Snap for 5534160 from 9681eef5ff to qt-release
...
Change-Id: I5bef0ed5db0af546d411d7f1a16f7ade69a21eab
2019-05-05 23:07:03 +00:00
bigbiff bigbiff
52f868b5d9
NTFS-3G: use newer libfuse-light in pie.
...
Change-Id: I66dc38a19524f1eaac8cc5afc1110c5d11fc74eb
2019-05-05 16:13:08 -04:00
bigbiff bigbiff
3f20a85c03
English language: Remove duplicate value.
...
Change-Id: I849acef3e19519bfe6b8dc5fdd9a50eda3f03e2a
2019-05-05 13:53:25 -04:00
Bill Yi and android-build-merger
daa2fc4723
[automerger skipped] Import translations. DO NOT MERGE am: 9681eef5ff -s ours
...
am: 1a8b3cab32 -s ours
am skip reason: subject contains skip directive
Change-Id: I7cb5d68cd9707958dbcf004e77e71445cd61a982
2019-05-04 20:21:07 -07:00