Commit Graph
10911 Commits
Author SHA1 Message Date
Tao BaoandGerrit Code Review cb930939a4 Merge "minadbd: adb rescue getprop returns newline-terminated result." 2019-06-10 23:43:09 +00:00
Tao Bao 57a27890ce minadbd: adb rescue getprop returns newline-terminated result.
This change addresses the comment in [1], which makes the results of
`adb shell getprop foo` and `adb rescue getprop foo` more consistent.
That is, both will return newline-terminated results now.

[1] https://r.android.com/c/platform/bootable/recovery/+/976340/3/minadbd/minadbd_services.cpp#188

Test: Run the following commands on taimen (under rescue mode):
    `adb rescue getprop ro.build.fingerprint`
    `adb rescue getprop ro.nonexistent`
    `adb rescue getprop`
Change-Id: I5af47f8ea4d569b8507e259daef87749c0945f47
2019-06-10 13:08:03 -07:00
Tao Bao 5359d777e6 minadbd: Support adb rescue getprop.
It dumps all the allowed properties, similar to `adb shell getprop`.

Bug: 134027350
Test: Run the command under rescue mode.
Change-Id: Ic0864ca0fb51505ec1e4f38af2464591aa576201
Merged-In: Ic0864ca0fb51505ec1e4f38af2464591aa576201
(cherry picked from commit d8db81a014)
2019-06-05 23:28:25 -07:00
Tao Bao 7a31ab675e minadbd: More allowed properties.
Most of these properties are already part of the fingerprint. This CL
allows querying them directly, instead of encouraging users to decode
from fingerprints.

Bug: 134027350
Test: Boot into rescue mode on taimen. Run `adb rescue getprop` with new
      props.
Change-Id: Id4667fcaf0e908c391085b22e22c957acd01d9c4
Merged-In: Id4667fcaf0e908c391085b22e22c957acd01d9c4
(cherry picked from commit 3b9ef341be)
2019-06-05 23:28:10 -07:00
bigbiff bigbiff 3c897aec16 fb2png: Fix compilation in android-9.0 repos.
Remove unused reference.
Change temp variables to size_t.
Update function calls for unused arguments.
Update static functions to ignore being defined
for each file that includes it.
Change-Id: If11d4e26daee54197f369974a09ec71f27abb59b
2019-06-05 20:00:54 -04:00
Tao Baoandandroid-build-merger 7ba4739546 Merge "minadbd: Support adb rescue getprop." am: 533a12c71e am: 0d00c1bf12 am: 024b53abe3
am: dc51048181

Change-Id: I843bb6771692c61b36b15570a8c9f8c7fe8f9e53
2019-06-05 14:23:49 -07:00
Tao Baoandandroid-build-merger dc51048181 Merge "minadbd: Support adb rescue getprop." am: 533a12c71e am: 0d00c1bf12
am: 024b53abe3

Change-Id: Ie3a7543b5fe48b80566b02dcd760173f799fb9bc
2019-06-05 14:18:52 -07:00
Tao Baoandandroid-build-merger 024b53abe3 Merge "minadbd: Support adb rescue getprop." am: 533a12c71e
am: 0d00c1bf12

Change-Id: I124c643a9aff253e65c5ad81c5f941d6bc697e40
2019-06-05 14:13:00 -07:00
Tao Baoandandroid-build-merger 0d00c1bf12 Merge "minadbd: Support adb rescue getprop."
am: 533a12c71e

Change-Id: Iea0f637a9c1a19d2e2d1edd68c0a86d482ce506a
2019-06-05 14:05:42 -07:00
Tao BaoandGerrit Code Review 533a12c71e Merge "minadbd: Support adb rescue getprop." 2019-06-05 20:43:55 +00:00
Tao Baoandandroid-build-merger 1182bcdc66 Merge "minadbd: More allowed properties." am: 1ef7f92871 am: 6c37304201 am: 9b2cfec8dd
am: 5726cbc184

Change-Id: I3b0a12a7d7eb19112a8049dadc2c3d563feddbaf
2019-06-04 20:59:04 -07:00
Tao Baoandandroid-build-merger 5726cbc184 Merge "minadbd: More allowed properties." am: 1ef7f92871 am: 6c37304201
am: 9b2cfec8dd

Change-Id: I9f8a5adacd97e02a893924b8d450ac994df37015
2019-06-04 19:56:00 -07:00
Tao Baoandandroid-build-merger 9b2cfec8dd Merge "minadbd: More allowed properties." am: 1ef7f92871
am: 6c37304201

Change-Id: I8295063fd81b0cdc7625410c1482c9bab538ebbc
2019-06-04 19:30:29 -07:00
Tao Baoandandroid-build-merger 6c37304201 Merge "minadbd: More allowed properties."
am: 1ef7f92871

Change-Id: I2e663ae4d334f40bf688b70630ad823c1eb92444
2019-06-04 17:53:25 -07:00
Tao Bao d8db81a014 minadbd: Support adb rescue getprop.
It dumps all the allowed properties, similar to `adb shell getprop`.

Bug: 134027350
Test: Run the command under rescue mode.
Change-Id: Ic0864ca0fb51505ec1e4f38af2464591aa576201
2019-06-04 15:09:41 -07:00
Tao BaoandGerrit Code Review 1ef7f92871 Merge "minadbd: More allowed properties." 2019-06-04 22:01:36 +00:00
Paul Duffinandandroid-build-merger 334fd5f2b1 Merge "Use icu4j instead of its deprecated legacy alias icu4j-host" am: 14bc5e1feb am: af4d1dda03 am: 2f8626c3f7
am: 8b733c3e84

Change-Id: I2377549c690dd10572f828457f44522b3951f77b
2019-06-04 03:02:00 -07:00
Paul Duffinandandroid-build-merger 8b733c3e84 Merge "Use icu4j instead of its deprecated legacy alias icu4j-host" am: 14bc5e1feb am: af4d1dda03
am: 2f8626c3f7

Change-Id: Ide1d3e178054a2dbd87fc9d3dac0bd14ef519a85
2019-06-04 02:49:59 -07:00
Paul Duffinandandroid-build-merger 2f8626c3f7 Merge "Use icu4j instead of its deprecated legacy alias icu4j-host" am: 14bc5e1feb
am: af4d1dda03

Change-Id: I4e11f19fa992ea7b8cc23437a041edf709356d39
2019-06-04 02:44:46 -07:00
Paul Duffinandandroid-build-merger af4d1dda03 Merge "Use icu4j instead of its deprecated legacy alias icu4j-host"
am: 14bc5e1feb

Change-Id: Ic7dd97abecd668ee087c37a2130360bf44dbbe02
2019-06-04 02:38:27 -07:00
Paul DuffinandGerrit Code Review 14bc5e1feb Merge "Use icu4j instead of its deprecated legacy alias icu4j-host" 2019-06-04 09:24:01 +00:00
Tao Bao 3b9ef341be minadbd: More allowed properties.
Most of these properties are already part of the fingerprint. This CL
allows querying them directly, instead of encouraging users to decode
from fingerprints.

Bug: 134027350
Test: Boot into rescue mode on taimen. Run `adb rescue getprop` with new
      props.
Change-Id: Id4667fcaf0e908c391085b22e22c957acd01d9c4
2019-06-03 12:14:18 -07:00
Paul Duffin eb586b7baf Use icu4j instead of its deprecated legacy alias icu4j-host
Bug: 134379140
Test: m droid
Change-Id: I71c2ac392361b3c6dfa693194c05116422335e55
2019-06-03 16:14:35 +01:00
Tianjie Xu 74b0f7cce0 Implement the TargetFile and BuildInfo
The TargetFile class parses a target-file and provides functions to read
its contents. And the BuildInfo tries to simulate the device with files
on host. Some work it does includes parsing the build properties,
and extracting the image files for partitions specified in the fstab.

Bug: 131911365
Test: unit tests pass, run simulator with cuttlefish, wear devices and from extracted TF.
Change-Id: Iefe4a96d619d2e4b3d038e31480f11a0f9a70afa
2019-05-31 17:55:36 -07:00
Tianjie Xuandandroid-build-merger 1e28fd0bc2 Merge "Disable building simulator for mac" am: f3dd821f76 am: 3489b274d0 am: b93dc08bc6
am: 0f379730f2

Change-Id: I8cd1a622d26916a79d70a79855caa3b2c2427640
2019-05-30 14:58:31 -07:00
Tianjie Xuandandroid-build-merger 0f379730f2 Merge "Disable building simulator for mac" am: f3dd821f76 am: 3489b274d0
am: b93dc08bc6

Change-Id: I1b191e246349299a381ee5cec9bf15fad99bea5c
2019-05-30 14:28:26 -07:00
Tianjie Xuandandroid-build-merger b93dc08bc6 Merge "Disable building simulator for mac" am: f3dd821f76
am: 3489b274d0

Change-Id: Idfe10693ecc07e4721bf32e1a7a914feb69f2dec
2019-05-30 14:17:05 -07:00
Tianjie Xuandandroid-build-merger 3489b274d0 Merge "Disable building simulator for mac"
am: f3dd821f76

Change-Id: Iccdde0099a51184fce6f86f9b7ad3f62ce33b36e
2019-05-30 14:08:32 -07:00
Treehugger RobotandGerrit Code Review f3dd821f76 Merge "Disable building simulator for mac" 2019-05-30 20:45:28 +00:00
Tianjie Xu 76e165d143 Disable building simulator for mac
Disable building the simulator and its support libraries to resolve the breakage
on mac host targets. Because the simulator is not intended to use on mac anyway.

Bug: 134047992
Test: mma
Change-Id: I488ab50cab1282f03250010b5334f1895d44f98b
2019-05-30 10:49:18 -07:00
Tianjie Xuandandroid-build-merger 96fa6831f4 Merge "Implement an update simulator to verify BB OTA packages on host" am: 65d7d5b8cf am: 29d9d7bbbe am: 55e82e2fc5
am: 36ca5abd94

Change-Id: Ia4e28377354bc96256ff24c6de8a853f3d4442e7
2019-05-29 11:18:30 -07:00
Tianjie Xuandandroid-build-merger 36ca5abd94 Merge "Implement an update simulator to verify BB OTA packages on host" am: 65d7d5b8cf am: 29d9d7bbbe
am: 55e82e2fc5

Change-Id: I67b8152c41b2e92a67f935488f631bff7f5cf6ee
2019-05-29 10:48:39 -07:00
Tianjie Xuandandroid-build-merger 55e82e2fc5 Merge "Implement an update simulator to verify BB OTA packages on host" am: 65d7d5b8cf
am: 29d9d7bbbe

Change-Id: Id0152ae0ef3b12501e67e9f3404bd2a379b79c7e
2019-05-29 10:44:17 -07:00
Tianjie Xuandandroid-build-merger 29d9d7bbbe Merge "Implement an update simulator to verify BB OTA packages on host"
am: 65d7d5b8cf

Change-Id: Ie3d3af1442c75563c10a9c6c2991426f1054305d
2019-05-29 10:37:34 -07:00
Tianjie XuandGerrit Code Review 65d7d5b8cf Merge "Implement an update simulator to verify BB OTA packages on host" 2019-05-29 17:20:36 +00:00
Tianjie Xu c1a5e26fd9 Implement an update simulator to verify BB OTA packages on host
Implement the simulator runtime and build the updater simulator as a host
executable. The code to parse the target-files and mocks the block devices
will be submitted in the follow-up.

Bug: 131911365
Test: unit tests pass

Change-Id: Ib1ba939aec8333ca68a45139514d772ad7a27ad8
2019-05-28 15:18:25 -07:00
Mark Salyzynandandroid-build-merger 8bca107758 Merge "recovery: report compliant reboot reason (Part Deux)" am: c0a51a01ce am: 7d0545f14a am: 3447708800
am: 7b2ca7f88b

Change-Id: Id352f6c8acfe6b406f21ebba1dd20bd075729f62
2019-05-28 09:35:00 -07:00
Mark Salyzynandandroid-build-merger 7b2ca7f88b Merge "recovery: report compliant reboot reason (Part Deux)" am: c0a51a01ce am: 7d0545f14a
am: 3447708800

Change-Id: I564c87f50d3a4a8ad6a26a16e96586e2ef235ca5
2019-05-28 09:27:54 -07:00
Mark Salyzynandandroid-build-merger 3447708800 Merge "recovery: report compliant reboot reason (Part Deux)" am: c0a51a01ce
am: 7d0545f14a

Change-Id: I5818816fc88d05e2b8b4fa7fec17a009f854e1f9
2019-05-28 09:22:53 -07:00
Mark Salyzynandandroid-build-merger 7d0545f14a Merge "recovery: report compliant reboot reason (Part Deux)"
am: c0a51a01ce

Change-Id: Ie92bd6205de683781a9a315657485cd232682de3
2019-05-28 09:17:51 -07:00
Treehugger RobotandGerrit Code Review c0a51a01ce Merge "recovery: report compliant reboot reason (Part Deux)" 2019-05-28 15:57:24 +00:00
android-build-team Robot 3ad8e569de Snap for 5606075 from af0a76d1c5 to qt-c2f2-release
Change-Id: I1fe793c932f605c790bf4633260ef17b3bc20244
2019-05-25 23:18:25 +00:00
android-build-team Robot 52ce9fdf21 Snap for 5606001 from af0a76d1c5 to qt-qpr1-release
Change-Id: Ic78a1225c03b30ae6e2e539e14219b65deabcccd
2019-05-25 23:17:26 +00:00
android-build-team Robot 07f68f8eb5 Snap for 5605988 from 35e0f6d290 to qt-release
Change-Id: I9910ea50bef71e4f1f27594af7797c588bf9c122
2019-05-25 23:09:51 +00:00
Ethan Yonker ae7ff3b2fa Fix symlink creation
Change-Id: I0d0bcdde2957974eb357a6f3d820bd5ab0fa47ee
2019-05-24 16:31:09 -05:00
Ethan Yonker abf1fb0086 Switch between dependencies and modules
Use LOCAL_REQUIRED_MODULES for Pie and up and
LOCAL_ADDITIONAL_DEPENDENCIES for Oreo and down.

Change-Id: I5365e782f98f3bbf4bf246be22c8f573824b65ee
2019-05-24 22:39:12 +02:00
Tianjie Xuandandroid-build-merger e255db34b1 Merge "Some clean ups to the updater" am: 52e61f6995 am: a0c0e04163 am: e89cfb6a41
am: bcade69f45

Change-Id: I49da90d03a26aa77b29ba7989e628566bfc41134
2019-05-24 11:46:51 -07:00
Tao Baoandandroid-build-merger e6b01a20ad [automerger skipped] Add misc_writer. am: 35e0f6d290 -s ours am: 865c17893b -s ours
am: 1406a210e6 -s ours
am skip reason: change_id I79548fc63fc79b705a0320868690569c3106949f with SHA1 35e0f6d290 is in history

Change-Id: I30f72535a86e9b076467746bf9cc112c30c02317
2019-05-24 10:02:03 -07:00
Peter Cai ea1764c9fa ext4crypt: support synthetic keys v3 on May update
Re-implemented SP800Derive in C++, which is added as the new key
derivation function in Android 9.0 May update. From file
services/core/java/com/android/server/locksettings/SP800Derive.java in
frameworks/base.

This is required to get TWRP working on any Android device that has a
screen lock set up after the May update.

Change-Id: I5c1a51b110033f2b0b75d5e36fd8098c05e95179
2019-05-24 20:41:12 +08:00
Tao Baoandandroid-build-merger 5f9c1c6a28 [automerger skipped] Add misc_writer. am: 35e0f6d290 am: af0a76d1c5 -s ours
am: 29f9d20f93 -s ours
am skip reason: change_id I79548fc63fc79b705a0320868690569c3106949f with SHA1 7ae0169842 is in history

Change-Id: I902181557ecf3328123438c1bfd7dbcd7871da38
2019-05-24 05:15:51 -07:00