Tao Bao
f8d4db46a9
Merge "otautil: Drop a few unneeded includes." am: 36f72131ff am: 7f9eb2e012
...
am: 78506ddf1a
Change-Id: I37d895c5d35fb9c9435e5bed838c524fb0fa0f17
2019-10-01 19:28:00 -07:00
Tao Bao
78506ddf1a
Merge "otautil: Drop a few unneeded includes." am: 36f72131ff
...
am: 7f9eb2e012
Change-Id: Ic094365bd36c3b466ec1904f1c6b16265f18f7da
2019-10-01 19:21:59 -07:00
Tao Bao
7f9eb2e012
Merge "otautil: Drop a few unneeded includes."
...
am: 36f72131ff
Change-Id: I7c358332c176fbc425490fd416f70ef35ac02cdb
2019-10-01 19:16:00 -07:00
Treehugger Robot
36f72131ff
Merge "otautil: Drop a few unneeded includes."
2019-10-02 02:00:52 +00:00
Tao Bao
f6ed376b20
otautil: Drop a few unneeded includes.
...
Test: mmma bootable/recovery
Change-Id: I6ed8f9eca7183f84537c770baaffddd22b6e9f28
2019-10-01 16:00:17 -07:00
Tao Bao
abdf3b93b6
Merge changes I6c35d2e4,If16c3e19 am: c3f32b95e5 am: 48fb5e27a1
...
am: be4305fcd1
Change-Id: I25bfe5dea51627e8d8d269860cff0b883636dc8e
2019-10-01 14:52:54 -07:00
Tao Bao
be4305fcd1
Merge changes I6c35d2e4,If16c3e19 am: c3f32b95e5
...
am: 48fb5e27a1
Change-Id: I93102d773ec791d162cedfe050a9a8c5230a2bb4
2019-10-01 14:45:47 -07:00
Tao Bao
48fb5e27a1
Merge changes I6c35d2e4,If16c3e19
...
am: c3f32b95e5
Change-Id: I2d0f9cbe2ec6d3a1429c0c01204bb41ff7e7cb13
2019-10-01 14:40:41 -07:00
Tao Bao
c3f32b95e5
Merge changes I6c35d2e4,If16c3e19
...
* changes:
Move mounts.cpp from libotautil into libupdater.
otautil: roots.cpp no longer needs 'mounts.h'.
2019-10-01 21:18:42 +00:00
Tao Bao
d628cfc153
Move mounts.cpp from libotautil into libupdater.
...
All the active users of mounts.h now live in updater/.
Test: mmma bootable/recovery
Test: Run recovery_unit_test on taimen.
Test: Code search shows no reference to otautil/mounts.h in device dirs.
Change-Id: I6c35d2e403e92a0111102d00aa4773f4f524650e
2019-10-01 12:13:04 -07:00
Tao Bao
331e5c4c98
otautil: roots.cpp no longer needs 'mounts.h'.
...
Commit 0f339e27bb moved part of the mounts
implementation into libfs_mgr. As a result, otautil/roots.cpp no longer
depends on anything in the local otautil/mounts.h.
Test: mmma bootable/recovery
Change-Id: If16c3e19a62933358fb0002a10e8556a99f9d29a
2019-10-01 12:02:56 -07:00
Steven Moreland
8465703b0b
Merge "Remove libhidltransport deps" am: e2ca8ba293 am: 3746d95338
...
am: 6e460f877a
Change-Id: I9134024f2a271d4eb3f4bdae57a2062da6c6cee9
2019-09-30 09:28:32 -07:00
Steven Moreland
6e460f877a
Merge "Remove libhidltransport deps" am: e2ca8ba293
...
am: 3746d95338
Change-Id: Idd29edebb4ee16c00815b7a7557385faee262984
2019-09-30 09:22:00 -07:00
Steven Moreland
3746d95338
Merge "Remove libhidltransport deps"
...
am: e2ca8ba293
Change-Id: Ia3ea9dfe765659d34f44a3486ade41b06be6f7f0
2019-09-30 09:15:58 -07:00
Steven Moreland
e2ca8ba293
Merge "Remove libhidltransport deps"
2019-09-30 15:56:03 +00:00
Tao Bao
2b27153d28
Merge "minadbd: Update README.md." am: ec734e5851 am: 79d93f9eee
...
am: 586fed8db2
Change-Id: I994acdaabbca974c18dc144d9b20366bcb192688
2019-09-27 17:36:48 -07:00
Tao Bao
586fed8db2
Merge "minadbd: Update README.md." am: ec734e5851
...
am: 79d93f9eee
Change-Id: I5a415f079f66cf67af17c08a7f84d2ae68c36c70
2019-09-27 17:30:45 -07:00
Tao Bao
79d93f9eee
Merge "minadbd: Update README.md."
...
am: ec734e5851
Change-Id: I133418ea66cce3fdb70c3baba7fa8d6b68beb740
2019-09-27 17:23:45 -07:00
Tao Bao
ec734e5851
Merge "minadbd: Update README.md."
2019-09-27 23:47:06 +00:00
Tao Bao
0cc2c5b453
minadbd: Update README.md.
...
Test: N/A
Change-Id: I7f4648f2b357de7d9700e38552a0156d13c1bd0b
2019-09-27 13:17:16 -07:00
Tao Bao
86a39318cb
Merge "minadbd: Export minadbd/types.h to libinstall." am: ffa9ffbd2b am: 74c405d87f
...
am: e0cb5d5c1e
Change-Id: Idd7bdcc93648d8de58f62d280aebd8d1dd00d449
2019-09-26 16:25:06 -07:00
Tao Bao
e0cb5d5c1e
Merge "minadbd: Export minadbd/types.h to libinstall." am: ffa9ffbd2b
...
am: 74c405d87f
Change-Id: I93f0cb7ea11664a69e76c703f95ee982ef9402da
2019-09-26 16:19:32 -07:00
Tao Bao
74c405d87f
Merge "minadbd: Export minadbd/types.h to libinstall."
...
am: ffa9ffbd2b
Change-Id: I18571b1a696b02cab050b570bf36878e25a27462
2019-09-26 16:13:36 -07:00
Tao Bao
ffa9ffbd2b
Merge "minadbd: Export minadbd/types.h to libinstall."
2019-09-26 22:46:14 +00:00
Colin Cross
c56c1e4480
Merge "Use libcrypto_static instead of libcrypto" am: 4c4c7dc26b am: 617d01a9c1
...
am: 819a24d44e
Change-Id: I1c2606b711ec9743ff6484cbbfb7e64dc79b71d8
2019-09-26 08:07:09 -07:00
Colin Cross
819a24d44e
Merge "Use libcrypto_static instead of libcrypto" am: 4c4c7dc26b
...
am: 617d01a9c1
Change-Id: I45e8687b462db7676efffd03323efbe1f273e9f2
2019-09-26 07:54:01 -07:00
Colin Cross
617d01a9c1
Merge "Use libcrypto_static instead of libcrypto"
...
am: 4c4c7dc26b
Change-Id: Ia77cc9f13f4807fd2276b332599a1b489cf4a9a6
2019-09-26 07:41:39 -07:00
Colin Cross
4c4c7dc26b
Merge "Use libcrypto_static instead of libcrypto"
2019-09-26 14:32:33 +00:00
Tao Bao
3305d48b0b
minadbd: Export minadbd/types.h to libinstall.
...
Test: mmma bootable/recovery
Change-Id: I503e942b23cc51024aa752c1eb3db5455a44a9d1
2019-09-26 00:04:11 -07:00
Steven Moreland
ff9b62b781
Remove libhidltransport deps
...
Since this was combined into libhidlbase.
Bug: 135686713
Test: build only (libhidltransport is empty)
Change-Id: I253e50726967044714275ab995fb8a8a57bcde36
2019-09-25 15:12:30 -07:00
Bill Yi
4c70d5d02d
[automerger skipped] Import translations. DO NOT MERGE am: 92214baec2 -s ours
...
am: 4a8558e9d8 -s ours
am skip reason: subject contains skip directive
Change-Id: I94d0b4fdcab116c3d626def7833fa013506d7ecb
2019-09-25 07:27:27 -07:00
Bill Yi
4a8558e9d8
[automerger skipped] Import translations. DO NOT MERGE
...
am: 92214baec2 -s ours
am skip reason: subject contains skip directive
Change-Id: If3581390553ec30c8c59f54b12506cdff680c657
2019-09-25 07:21:27 -07:00
Bill Yi
92214baec2
Import translations. DO NOT MERGE
...
Change-Id: I18c2199dc9439d6013329d1f0eb40dd106618bfb
Auto-generated-cl: translation import
2019-09-24 14:36:40 -07:00
Tao Bao
6b60b35b4b
Merge "applypatch: Add backup_source parameter to PatchPartition." am: 86b54dc493 am: 164f4759a2
...
am: 18185ae561
Change-Id: I313f427443d4d1c87990ffc6ebbb83e466b00588
2019-09-23 16:40:22 -07:00
Tao Bao
18185ae561
Merge "applypatch: Add backup_source parameter to PatchPartition." am: 86b54dc493
...
am: 164f4759a2
Change-Id: I0d4bc6a5ec15265889e6df57ebdb0ee7c4ed64ca
2019-09-23 16:33:00 -07:00
Tao Bao
164f4759a2
Merge "applypatch: Add backup_source parameter to PatchPartition."
...
am: 86b54dc493
Change-Id: I0776b40d710ba577667aaba055ed6555eb9fbefc
2019-09-23 16:23:57 -07:00
Tao Bao
86b54dc493
Merge "applypatch: Add backup_source parameter to PatchPartition."
2019-09-23 23:07:40 +00:00
Colin Cross
0e643e4d7f
Use libcrypto_static instead of libcrypto
...
Replace libcrypto with libcrypto_static, which can be protected through
visibility to ensure only modules that don't affect FIPS certification
can use it.
Bug: 141248879
Test: m checkbuild
Change-Id: I0affaa292237bdbc772d3adc36086905ed6fbe9d
2019-09-23 13:54:09 -07:00
Tao Bao
117fae7049
Merge "applypatch: Use static libs for libbrotli and libbz." am: 4f86af7b9a am: 5108b0b7f4
...
am: 1fcdb2709b
Change-Id: I285c95c4972e5fa39be55666de19d426edb226c6
2019-09-23 13:14:31 -07:00
Tao Bao
1fcdb2709b
Merge "applypatch: Use static libs for libbrotli and libbz." am: 4f86af7b9a
...
am: 5108b0b7f4
Change-Id: Ib112b7c8ecc533224459c045329a19e50e68f389
2019-09-23 13:08:30 -07:00
Tao Bao
5108b0b7f4
Merge "applypatch: Use static libs for libbrotli and libbz."
...
am: 4f86af7b9a
Change-Id: If7c24567470f842da95ea339f691a355c4402da9
2019-09-23 12:54:38 -07:00
Treehugger Robot
4f86af7b9a
Merge "applypatch: Use static libs for libbrotli and libbz."
2019-09-23 19:33:30 +00:00
Tao Bao
5234ad466c
applypatch: Add backup_source parameter to PatchPartition.
...
And set it to false when installing recovery image via applypatch. We
only need to back up the source partition when doing in-place update
(e.g. when updating a given partition under recovery). When installing
recovery image via applypatch, we won't touch the source partition (i.e.
/boot).
Removing the backup step also allows dropping the dac_override_allowed
permission. Previously it was needed due to the access to /cache.
Because applypatch runs as root:root, while /cache is owned by
system:cache with 0770.
Bug: 68319577
Test: Invoke the code that installs recovery image; check that recovery
is installed successfully without denials.
Test: recovery_unit_test passes on taimen.
Change-Id: I549a770b511762189d6672a2835b6e403d695919
2019-09-23 11:26:48 -07:00
Tao Bao
71c35b9fba
applypatch: Use static libs for libbrotli and libbz.
...
Prior to this CL, applypatch was the only user of libbrotli.so and
libbz.so (update_engine and puffin have been using the static versions).
This CL switches applypatch to their static versions to save space in
/system.
Sizes prior to the change (aosp_taimen-userdebug):
/system/bin/applypatch 91296
/system/lib64/libbrotli.so 688536
/system/lib64/libbz.so 79560
After:
/system/bin/applypatch 272368
Test: `m dist`
Test: Check the built blueline-userdebug target. libbrotli.so and
libbz.so are not installed.
Change-Id: I08422a0d5a287bbac69aa9f6cfd9c97e5b2e9078
2019-09-23 09:17:52 -07:00
Tao Bao
a5898a4e85
Merge "recovery: Don't report unrecognized option in recovery_main." am: 785d0b4efa am: e9788bc361
...
am: 7b72231ffa
Change-Id: I0eb3026ec113f196c80dc070b1e704f8038ffe10
2019-09-19 13:38:32 -07:00
Tao Bao
7b72231ffa
Merge "recovery: Don't report unrecognized option in recovery_main." am: 785d0b4efa
...
am: e9788bc361
Change-Id: I4873bf08c5406a0e2270e2ee267a962b4f3164bf
2019-09-19 13:31:59 -07:00
Tao Bao
e9788bc361
Merge "recovery: Don't report unrecognized option in recovery_main."
...
am: 785d0b4efa
Change-Id: Icde802ad7a85437311b54f973d4e7066e7a4f96e
2019-09-19 13:25:31 -07:00
Treehugger Robot
785d0b4efa
Merge "recovery: Don't report unrecognized option in recovery_main."
2019-09-19 20:07:04 +00:00
Tao Bao
fa433f7956
Merge "tests: recovery_unit_test requires root." am: 15a381e52c am: 687bb18724
...
am: 3fd5d407a4
Change-Id: I84f1b329114b423e4a308e0577d4324de1c63e76
2019-09-19 11:16:45 -07:00
Tao Bao
3fd5d407a4
Merge "tests: recovery_unit_test requires root." am: 15a381e52c
...
am: 687bb18724
Change-Id: Ibf26efe9aa858a1f6c4fce645bc67e55e7350576
2019-09-19 11:10:27 -07:00