PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,256 Commits 1 Branch 0 Tags
819a24d44ecdd47ff19f869f7294de8271fd33f2
Commit Graph
8256 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Crossandandroid-build-merger 819a24d44e Merge "Use libcrypto_static instead of libcrypto" am: 4c4c7dc26b 
am: 617d01a9c1

Change-Id: I45e8687b462db7676efffd03323efbe1f273e9f2
 2019-09-26 07:54:01 -07:00
Colin Crossandandroid-build-merger 617d01a9c1 Merge "Use libcrypto_static instead of libcrypto" 
am: 4c4c7dc26b

Change-Id: Ia77cc9f13f4807fd2276b332599a1b489cf4a9a6
 2019-09-26 07:41:39 -07:00
Colin CrossandGerrit Code Review 4c4c7dc26b Merge "Use libcrypto_static instead of libcrypto" 2019-09-26 14:32:33 +00:00
Bill Yiandandroid-build-merger 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 Baoandandroid-build-merger 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 Baoandandroid-build-merger 164f4759a2 Merge "applypatch: Add backup_source parameter to PatchPartition." 
am: 86b54dc493

Change-Id: I0776b40d710ba577667aaba055ed6555eb9fbefc
 2019-09-23 16:23:57 -07:00
Tao BaoandGerrit Code Review 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 Baoandandroid-build-merger 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 Baoandandroid-build-merger 5108b0b7f4 Merge "applypatch: Use static libs for libbrotli and libbz." 
am: 4f86af7b9a

Change-Id: If7c24567470f842da95ea339f691a355c4402da9
 2019-09-23 12:54:38 -07:00
Treehugger RobotandGerrit Code Review 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 Baoandandroid-build-merger 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 Baoandandroid-build-merger 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 RobotandGerrit Code Review 785d0b4efa Merge "recovery: Don't report unrecognized option in recovery_main." 2019-09-19 20:07:04 +00:00
Tao Baoandandroid-build-merger 3fd5d407a4 Merge "tests: recovery_unit_test requires root." am: 15a381e52c 
am: 687bb18724

Change-Id: Ibf26efe9aa858a1f6c4fce645bc67e55e7350576
 2019-09-19 11:10:27 -07:00
Tao Baoandandroid-build-merger 687bb18724 Merge "tests: recovery_unit_test requires root." 
am: 15a381e52c

Change-Id: Ide2897a766d159126d9b0b38882f9cdde0ac2b9e
 2019-09-19 11:03:22 -07:00
Tao BaoandGerrit Code Review 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 Baoandandroid-build-merger 78df66969b Merge "Update the instruction for building recovery image on Pixels." am: 2d6e8f2ea8 
am: 41c46448a6

Change-Id: If3325d5d689d1214627e71f882d248b8711edaee
 2019-09-13 10:40:32 -07:00
Tobias Thiererandandroid-build-merger 5ece6250f0 Merge "Link libcrypto dynamically for recovery unit tests." am: 54100d3348 
am: 97fee1c3b2

Change-Id: I1c839029b1e967234d1c181eb30b9638a42cd4e3
 2019-09-13 10:32:42 -07:00
Tobias Thiererandandroid-build-merger 9254aea083 Merge "Set LOCAL_INJECT_BSSL_HASH for updater" am: 0af65d8c4a 
am: a706ceec37

Change-Id: I7bb7132e2efff9bb0391a4c7f606ad0fe3232de5
 2019-09-13 10:32:38 -07:00
Tao Baoandandroid-build-merger 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 Thiererandandroid-build-merger 97fee1c3b2 Merge "Link libcrypto dynamically for recovery unit tests." 
am: 54100d3348

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

Change-Id: I6db7618d1aaea087fe52a17aa3212b1b13b40a89
 2019-09-13 10:18:23 -07:00
Tao BaoandGerrit Code Review 2d6e8f2ea8 Merge "Update the instruction for building recovery image on Pixels." 2019-09-13 17:08:37 +00:00
Tobias ThiererandGerrit Code Review 54100d3348 Merge "Link libcrypto dynamically for recovery unit tests." 2019-09-13 16:56:06 +00:00
Tobias ThiererandGerrit Code Review 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 Andersonandandroid-build-merger c0e2ac8e5d Merge "Improve error messaging when bootcontrol HAL fails to load." am: 4878f6a31c 
am: 1074b8a539

Change-Id: I6438198585e750b796d4cbc5c0e05940cbd90e40
 2019-09-09 17:38:14 -07:00
David Andersonandandroid-build-merger 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 AndersonandGerrit Code Review 4878f6a31c Merge "Improve error messaging when bootcontrol HAL fails to load." 2019-09-10 00:09:07 +00:00
Xin Liandandroid-build-merger 4b1e751181 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 
am: b3b43be5d8 -s ours
am skip reason: change_id I8a2c42ff322242f08fd6601536c3f9ee50d0f633 with SHA1 02ea8f4969 is in history

Change-Id: Ied04f35b7ebcb462c22f3fff019953844606415b
 2019-09-08 15:06:31 -07: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 Morelandandandroid-build-merger c5c995c095 Merge "Remove reference to libhwbinder_noltopgo." am: a44f947b6d 
am: 02ea8f4969

Change-Id: I3eaf679e008b2dfc2ad7134eb75db4e6550a05ca
 2019-09-06 14:17:29 -07:00
Steven Morelandandandroid-build-merger 02ea8f4969 Merge "Remove reference to libhwbinder_noltopgo." 
am: a44f947b6d

Change-Id: I8a2c42ff322242f08fd6601536c3f9ee50d0f633
 2019-09-06 11:13:36 -07:00
Steven MorelandandGerrit Code Review a44f947b6d Merge "Remove reference to libhwbinder_noltopgo." 2019-09-06 17:59:21 +00:00
David Andersonandandroid-build-merger 569f587afd Merge "boot_control: Don't allow current_slot_ to be -1." am: 9c0f102828 am: 0c34ef807b 
am: 185013413e

Change-Id: I6a3c4bdaefca35eb23c362981bef43169cb9fcb0
 2019-09-05 16:59:02 -07:00
David Andersonandandroid-build-merger 185013413e Merge "boot_control: Don't allow current_slot_ to be -1." am: 9c0f102828 
am: 0c34ef807b

Change-Id: I96aeea2e63243d587fe3183f1388c9bc76ee5d86
 2019-09-05 16:51:48 -07:00
David Andersonandandroid-build-merger 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 AndersonandGerrit Code Review 9c0f102828 Merge "boot_control: Don't allow current_slot_ to be -1." 2019-09-05 20:21:47 +00:00
Xin Liandandroid-build-merger 42c411dbbc [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: e0364db712 -s ours 
am: 8bb31dbab7

Change-Id: I5884c4dd3197ed2b62500eea0ef7ee864c4ab8da
 2019-09-05 11:32:10 -07:00
Xin Liandandroid-build-merger 8bb31dbab7 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" 
am: e0364db712 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie38bb30aa5743600e5c563357a2d577e3e3710d9
 2019-09-05 11:20:06 -07:00
Xin LiandGerrit Code Review e0364db712 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:28 +00:00