Commit Graph

8245 Commits

Author SHA1 Message Date
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
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
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
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
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
92214baec2 Import translations. DO NOT MERGE
Change-Id: I18c2199dc9439d6013329d1f0eb40dd106618bfb
Auto-generated-cl: translation import
2019-09-24 14:36:40 -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
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
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
687bb18724 Merge "tests: recovery_unit_test requires root."
am: 15a381e52c

Change-Id: Ide2897a766d159126d9b0b38882f9cdde0ac2b9e
2019-09-19 11:03:22 -07:00
Tao Bao
15a381e52c Merge "tests: recovery_unit_test requires root." 2019-09-19 17:43:54 +00:00
Tao Bao
dfb053e815 tests: recovery_unit_test requires root.
Bug: 141272654
Test: TreeHugger (recovery_unit_test no longer fails)
Change-Id: I47cbee274e659e3d90be5a77b215466d2973c7d6
2019-09-19 08:08:54 -07:00
Tao Bao
ff185865fd recovery: Don't report unrecognized option in recovery_main.
recovery_main is only interested in a subset of options. Suppress the
warning for unrecognized options (which are likely intended for
recovery).

Fixes: 141239600
Test: On Pixel 3a, write `--security` flag into /misc and reboot
      recovery. Check that recovery_main no longer reports
      "unrecognized option" warning.
      # echo "recovery\n--security\n" | \
          dd of=/dev/block/by-name/misc conv=notrunc bs=1 seek=64
      # killall -9 recovery
      # cat /tmp/recovery.log
Test: Write `--show_text=foo` instead, and check that recovery reports
      "option `--show_text' doesn't allow an argument".
Change-Id: I1cb3a5ed6db91e41453b8aad00c8608f78ac1fa6
2019-09-18 16:12:59 -07:00
Tao Bao
41c46448a6 Merge "Update the instruction for building recovery image on Pixels."
am: 2d6e8f2ea8

Change-Id: I4f009637f8a75996a43a400a5ceaed193e0e54ab
2019-09-13 10:22:40 -07:00
Tobias Thierer
97fee1c3b2 Merge "Link libcrypto dynamically for recovery unit tests."
am: 54100d3348

Change-Id: I804ef56f77f28ce9e2d74b2227e7c26a3b6c22f2
2019-09-13 10:18:28 -07:00
Tobias Thierer
a706ceec37 Merge "Set LOCAL_INJECT_BSSL_HASH for updater"
am: 0af65d8c4a

Change-Id: I6db7618d1aaea087fe52a17aa3212b1b13b40a89
2019-09-13 10:18:23 -07:00
Tao Bao
2d6e8f2ea8 Merge "Update the instruction for building recovery image on Pixels." 2019-09-13 17:08:37 +00:00
Tobias Thierer
54100d3348 Merge "Link libcrypto dynamically for recovery unit tests." 2019-09-13 16:56:06 +00:00
Tobias Thierer
0af65d8c4a Merge "Set LOCAL_INJECT_BSSL_HASH for updater" 2019-09-13 16:56:06 +00:00
Pete Bentley
189d424ced Link libcrypto dynamically for recovery unit tests.
Tested by running recovery_unit_test as described in
https://android.googlesource.com/platform/bootable/recovery/+/refs/heads/master/README.md

Attempted to build and boot a recovery image with the
same change to confirm it still works, but
m recoveryimage-nodeps
fails for me.

Bug: 140940227
Test: See above
Change-Id: I00545968a0e5684823e505f2ddbe7e993319b5d4
2019-09-13 12:18:44 +01:00
Tao Bao
95656827dd Update the instruction for building recovery image on Pixels.
Test: N/A
Change-Id: I14d7bba5b214cc0bf43d6294cff1b7dcbea72ee8
2019-09-12 13:10:44 -07:00
David Anderson
1074b8a539 Merge "Improve error messaging when bootcontrol HAL fails to load."
am: 4878f6a31c

Change-Id: Ic9b5bacec378bd497d6d488b98dd1b224aa6e166
2019-09-09 17:27:11 -07:00
David Anderson
4878f6a31c Merge "Improve error messaging when bootcontrol HAL fails to load." 2019-09-10 00:09:07 +00:00
Xin Li
b3b43be5d8 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
No content change.

Bug: 135460123
Change-Id: I70fc102e00f98edd34b59661c00a8abbe37a8f26
Merged-In: I8a2c42ff322242f08fd6601536c3f9ee50d0f633
2019-09-08 12:42:27 -07:00
Steven Moreland
02ea8f4969 Merge "Remove reference to libhwbinder_noltopgo."
am: a44f947b6d

Change-Id: I8a2c42ff322242f08fd6601536c3f9ee50d0f633
2019-09-06 11:13:36 -07:00
Steven Moreland
a44f947b6d Merge "Remove reference to libhwbinder_noltopgo." 2019-09-06 17:59:21 +00:00
David Anderson
0c34ef807b Merge "boot_control: Don't allow current_slot_ to be -1."
am: 9c0f102828

Change-Id: I28a50628ecdaf2a6f0ccf0e1a93cf9f70fa47ad0
2019-09-05 16:41:07 -07:00
Colin Cross
d81519400c Set LOCAL_INJECT_BSSL_HASH for updater
updater is built in Make and statically links libcrypto,
so it needs to set LOCAL_INJECT_BSSL_HASH to make the FIPS self
test pass.

Bug: 137267623
Test: m checkbuild
Change-Id: Ib253c870090ac8026f5cbb005d6b0e935c73edd1
2019-09-05 15:34:50 -07:00
Steven Moreland
e4f1a781f5 Remove reference to libhwbinder_noltopgo.
No longer needed.

Bug: 135558503
Test: build only
Change-Id: Ia1257513c6276cdb01604fbedb411e7412d02b84
2019-09-05 14:29:23 -07:00
David Anderson
9c0f102828 Merge "boot_control: Don't allow current_slot_ to be -1." 2019-09-05 20:21:47 +00:00
Xin Li
e0364db712 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:28 +00:00
David Anderson
b18f153b12 Improve error messaging when bootcontrol HAL fails to load.
Bug: N/A
Test: manual test
Change-Id: I6bf849dba4ae66353c44875ece30917283557327
2019-09-04 18:12:35 -07:00
David Anderson
643ddd99df boot_control: Don't allow current_slot_ to be -1.
If the HAL is run on a non-A/B device, it does not fail gracefully; it
will segfault because the current_slot is -1 and methods do not protect
against this. Instead, have Init() fail if we can't determine the
current slot.

Bug: 130078382
Test: vts tests
Change-Id: I2d3094518a842b1a764427d2da9d46781a9f26da
2019-09-04 18:12:23 -07:00
Xin Li
007ac2d5fb DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: Id844b347e95335800502d9b5aeb15e18aabd29e1
2019-09-04 13:32:49 -07:00