Commit graph

9188 commits

Author SHA1 Message Date
Bob Badour
29be3f6ef1 [LSC] Add LOCAL_LICENSE_KINDS to bootable/recovery
Added SPDX-license-identifier-Apache-2.0 to:
  applypatch/Android.bp
  bootloader_message/Android.bp
  edify/Android.bp
  fuse_sideload/Android.bp
  install/Android.bp
  minadbd/Android.bp
  minui/Android.bp
  otautil/Android.bp
  recovery_ui/Android.bp
  recovery_utils/Android.bp
  tests/Android.bp
  tools/image_generator/Android.bp
  tools/recovery_l10n/Android.bp
  uncrypt/Android.bp
  update_verifier/Android.bp
  updater/Android.bp
  updater/Android.mk
  updater_sample/Android.bp
  updater_sample/tests/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT
    SPDX-license-identifier-OFL
to:
  Android.bp
  Android.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I3da761b525452838977297f773974000d4de7bd6
2021-02-14 10:37:20 -08:00
Treehugger Robot
c136106159 Merge "recovery: don't mount acct" 2021-02-13 21:32:31 +00:00
Marco Ballesio
65851cad82 recovery: don't mount acct
/acct is not necessary anymore for process group creation (it migrated
to /sys/fs/cgroup and is automatically mounted by libprocessgroup)

Bug: 168907513
Test: booted in remote mode and tested adb sideload
Change-Id: Iaa455df65f393ac1f67ae81c6e78d8f4934d88a2
2021-02-11 16:36:50 -08:00
Julien Desprez
8f014fa506 Merge "Clean up TEST_MAPPING after default update" 2021-02-11 19:44:59 +00:00
Julien Desprez
2f1a1bafb4 Clean up TEST_MAPPING after default update
cc_test_host doesn't need TEST_MAPPING config anymore to run in
presubmit. (go/a-unit-tests)

Change-Id: Ia07ea311cf6febc2f937ab14966ad21dfd623c69
Test: presubmit
Bug: 178646865
2021-02-11 04:32:26 +00:00
Treehugger Robot
bc1165edbc Merge "Fix SnapshotManager instantiation." 2021-02-08 21:30:11 +00:00
Bob Badour
50b96cdf73 Merge "Fix license_type. Contains OFL" 2021-02-08 20:11:59 +00:00
David Anderson
ebce8e6306 Fix SnapshotManager instantiation.
New() should be used instead of NewForFirstStageMount().

Bug: 168258606
Test: data wipe with VABC merge in progress
Change-Id: Idf2b01a504b577766da303091721764242e99a69
2021-02-04 20:23:15 -08:00
Bob Badour
a74bba9e01 Fix license_type. Contains OFL
See: http://go/android-license-checking-v2-lsc

Test: m all

Bug: 151953481
Bug: 151177513
Bug: 67772237

Exempt-From-Owner-Approval: janitorial work
Change-Id: Iaa673cbfa9ad46b03e90c11cdebf935e892b53a7
2021-02-03 12:15:52 -08:00
Elliott Hughes
0cd9a63603 Merge "minui: remove libadf since it is no longer supported" 2021-01-22 00:43:29 +00:00
Marissa Wall
7429176260 minui: remove libadf since it is no longer supported
Libadf is being removed since there are no android common kernels
that support adf. Remove support from miniui.

Test: Compiles and boots
Bug: 150467766

Change-Id: Ic66ea7a012b0466810ddeb8f884150b50c8ae769
2021-01-21 14:05:21 -08:00
Tianjie Xu
e9d25da64d Merge "Don't build host binary for applypatch" 2021-01-15 03:07:53 +00:00
Tianjie
b810334a8d Don't build host binary for applypatch
This solves the build failured on mac, and we don't really need a
host binary.

Test: mma
Change-Id: I55b74f411fb5385417d474b753c830c855db7794
2021-01-14 18:17:07 -08:00
Kelvin Zhang
e7a060a91b Merge changes from topic "imgdiff"
* changes:
  Re-enable failed imgpatch tests
  Switch imgdiff to use libz_stable
2021-01-14 15:04:34 +00:00
Kelvin Zhang
07ba4483a6 Re-enable failed imgpatch tests
Now we added a libz variant without the offending optimizations,
    re-enable tests.

Test: treehugger
Bug: 177076632
Change-Id: I6969090b2cb4c059d952df7cc034d0ed1ac366b2
2021-01-13 10:10:15 -05:00
Kelvin Zhang
2f2749f213 Switch imgdiff to use libz_stable
libz contain platform dependent optimization flags, and sometimes that
cause reconstruction of blobs to fail. Use libz_stable instead

Bug: 177076632
Test: treehugger

Change-Id: I3a8c1591672537d1c754b2bc5b26f939dd80ed47
2021-01-13 10:10:15 -05:00
Treehugger Robot
043ef5ff40 Merge "Disable failed imgpatch tests" 2021-01-12 21:00:45 +00:00
Kelvin Zhang
d77e7ea105 Disable failed imgpatch tests
For a proper solution, add a variant of libz which doesn't have platform
dependent optimizations, and make imgdiff use that version.
Test: treehugger
Bug: 177076632

Change-Id: Ia9e926c1adf22d351315eeec5ad1fabc3d48efd5
2021-01-12 14:45:29 -05:00
Treehugger Robot
b9e39a0828 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-02 03:21:43 +00:00
Bill Yi
28d73e04b5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iae7aeba0daf150b22c265e4924100d0564f4e8cd
2021-01-01 17:32:58 +00:00
Tianjie Xu
40d4bc9e19 Merge "Add doc for image_generator" 2020-12-28 23:38:57 +00:00
Treehugger Robot
d694016206 Merge "minui: fix mem leakage issue" 2020-12-28 07:08:04 +00:00
lijiazi
7d306fbf4e minui: fix mem leakage issue
Use free to release GRSurface object will not call data_'s
DataDeleter, then the buf data_ points to will leakage.
Use delete release GRSurface object.

Test: manual

Change-Id: I53a9ea5a4ad67de1662c707a5ea59d738bd9c2d8
Signed-off-by: lijiazi <lijiazi@xiaomi.com>
2020-12-23 19:21:06 +08:00
Tianjie
6450acf032 Add doc for image_generator
Bug: 143630837
Test: check preview
Change-Id: I3b7ca52e2a13685a523901092df79b039e2ad96c
2020-12-20 20:00:30 -08:00
Kelvin Zhang
a8e394942e Merge "Do not call exit() immediately after serving sideload" 2020-12-15 17:52:58 +00:00
Kelvin Zhang
e32c9f728e Do not call exit() immediately after serving sideload
Wait for socket to close before exit(), so that last "DONEDONE" message
is correctly sent.

Test: enter recovery, sideload an OTA, verify that no read error occured
      on client side. Repeat 5 times.
Bug: 155158483
Change-Id: Ibb02548d8c03fb77f8f60cb69cff84c33903adc0
2020-12-14 17:22:16 -05:00
Bill Yi
b1b27d1113 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic32d018d3999147ef0a9ef625006cf069e46bc74
2020-12-03 19:27:57 -08:00
Xin Li
ade32af710 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
Bug: 172690556
Merged-In: Idc15c7280ab625d015801313ae71bf04a5abdf81
Change-Id: I2d3ec29aa5b0c162c70e7712025eaa22ec769dcc
2020-11-23 13:12:20 -08:00
Will Coster
923cdf3db1 Merge "Add a fuzzer for OTA package verification" am: 6a4dbdf088
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1495296

Change-Id: I35603bcb3178373414b19bbaca94d270e88b827c
2020-11-16 22:59:34 +00:00
Will Coster
6a4dbdf088 Merge "Add a fuzzer for OTA package verification" 2020-11-16 22:43:19 +00:00
Will Coster
de455707e6 Add a fuzzer for OTA package verification
This is a pretty simplistic approach, it just shoves random data at the
verifier. The OTA format isn't too complicated so this should hopefully
be sufficient to let the fuzzer exercise the potentially interesting
parsing code.

Test: Let the fuzzer run on device for awhile:
      1) FUZZ=libinstall_verify_package_fuzzer
      2) SANITIZE_TARGET=hwaddress make ${FUZZ}
      3) cd ${ANDROID_PRODUCT_OUT} && adb root && adb sync data
      4) adb shell /data/fuzz/arm64/${FUZZ}/${FUZZ}
Change-Id: Icac6bde017b497d9f92c06191eb29e107ba9c0a7
2020-11-10 14:26:17 -08:00
Treehugger Robot
6ab06e1de6 Merge "Expose EthernetDevice to custom UIs" am: 0feaf90f92
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1491198

Change-Id: I3bf249a154df6cbdc3a39212e537ff96ad694c3f
2020-11-10 04:05:16 +00:00
Treehugger Robot
0feaf90f92 Merge "Expose EthernetDevice to custom UIs" 2020-11-10 03:43:33 +00:00
Alistair Delva
f7b547171e Expose EthernetDevice to custom UIs
Make it possible to build a custom UI which uses EthernetRecoveryUI.

Since EthernetRecoveryUI must be used with EthernetDevice, but the
make_device() function is the only place a custom UI can be specified,
we need to move the common EthernetDevice to the recovery_ui core and
make a new "default_ethernet_device" which looks like the other
default device library stubs, for backwards compatibility.

This makes it possible to use EthernetRecoveryUI on cuttlefish.

Bug: 172693524
Change-Id: I6a66bb949ef97d06f532adb286d2db4c002d2924
2020-11-06 16:35:46 -08:00
Baligh Uddin
7f4a3daee5 Merge "Migrate system/core/adb to packages/modules/adb" am: 7bc92050e3
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1465385

Change-Id: I3596c39c29e7837a5ccc3850c1e6cb3d5177c365
2020-10-23 16:39:25 +00:00
Baligh Uddin
7bc92050e3 Merge "Migrate system/core/adb to packages/modules/adb" 2020-10-23 16:16:32 +00:00
Baligh Uddin
0e313c1c2c Migrate system/core/adb to packages/modules/adb
BUG: 167963357
Test: TH
Merged-In: Ied3afa5d19d814155c5ecbe2363ba544f2ab96b7
Change-Id: Ied65135d7c635d1675af591ccc64c26632935161
2020-10-23 03:42:07 +00:00
Xin Li
4177367a4a Skip ab/6749736 in stage.
Merged-In: Iee28a5365320f99997d4ac528655786d49316373
Change-Id: If76f2e034d87760c588f3b9fd35f9ff517c20a40
2020-10-08 17:19:20 -07:00
Tianjie Xu
366ae2cc60 Merge "Add test config for recovery_host_test" am: aa5993ef96
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1452035

Change-Id: Ia2aeab90cbdb438b1f43c7ac9f2d7bde1d7b2a6b
2020-10-07 07:56:30 +00:00
Tianjie Xu
aa5993ef96 Merge "Add test config for recovery_host_test" 2020-10-07 02:29:18 +00:00
Tianjie
581a824401 Add test config for recovery_host_test
Bump the timeout as we see some flakiness in b/170178152. The other
part of the config is copied from the auto-generated config in
out/host/linux-x86/testcases/recovery_host_test/recovery_host_test.config

Bug: 170178152
Test: treehugger
Change-Id: Ia84c90ba6a686c47ecc7d8331c7e8c7cb4b78292
2020-10-06 23:31:04 +00:00
Tianjie Xu
4a242eddd4 Merge "Revert "Link to libsnapshot_cow everywhere libsnapshot is linked."" am: 577f6c2cf6
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1447799

Change-Id: I6e082e5995b6c97b53f607dad161d3b423f85fc4
2020-10-03 20:11:09 +00:00
Tianjie Xu
577f6c2cf6 Merge "Revert "Link to libsnapshot_cow everywhere libsnapshot is linked."" 2020-10-03 19:27:32 +00:00
Tianjie Xu
00e91ff8b9 Revert "Link to libsnapshot_cow everywhere libsnapshot is linked."
Revert submission 1433573-vab-libsnapshot-linkage

Reason for revert: b/169981170, update crash for droidfooders.
Reverted Changes:
Ie75bba98c:Link to libsnapshot_cow where libsnapshot is linke...
Ieedfadc55:libsnapshot: Partially implement OpenSnapshotWrite...
I28a5d4a88:Link to libsnapshot_cow everywhere libsnapshot is ...

Change-Id: I8c774ca4a8dec21dd308694bb8205861a19c3e12
2020-10-03 07:27:00 +00:00
Treehugger Robot
1c87c957f5 Merge "Link to libsnapshot_cow everywhere libsnapshot is linked." am: dd11d217a0 am: 2e37499b96 am: 6f74ef440d am: 3a9d4528f6
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1434951

Change-Id: Idc15c7280ab625d015801313ae71bf04a5abdf81
2020-09-30 00:06:59 +00:00
Treehugger Robot
3a9d4528f6 Merge "Link to libsnapshot_cow everywhere libsnapshot is linked." am: dd11d217a0 am: 2e37499b96 am: 6f74ef440d
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1434951

Change-Id: Ic0b6172ff565fab42aa3cbefaacf56835f09e749
2020-09-29 23:28:59 +00:00
Treehugger Robot
6f74ef440d Merge "Link to libsnapshot_cow everywhere libsnapshot is linked." am: dd11d217a0 am: 2e37499b96
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1434951

Change-Id: Ib5fd4e74c7522da2e76bab09f37ee6e5f1d64227
2020-09-29 23:10:32 +00:00
Treehugger Robot
2e37499b96 Merge "Link to libsnapshot_cow everywhere libsnapshot is linked." am: dd11d217a0
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1434951

Change-Id: I0064853f6081407f08519e42bf440d2e41b67b06
2020-09-29 22:41:55 +00:00
Treehugger Robot
dd11d217a0 Merge "Link to libsnapshot_cow everywhere libsnapshot is linked." 2020-09-29 21:52:07 +00:00
David Anderson
6943dfe9ad Link to libsnapshot_cow everywhere libsnapshot is linked.
Bug: 168554689
Test: recovery builds
Change-Id: I28a5d4a88914b10db1ca8298947afc2314a9ae8a
2020-09-22 15:49:44 -07:00