Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
imknown committed Aug 25, 2020
2 parents 428978e + b083ba3 commit 2c7032e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/src/main/assets/lld.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"2020-08-24 13:55 +0800","android":{"securityPatchLevel":"2020-08-05","build":{"version":"2020-08-03","details":[{"id":"QQ3A.200805.001","revision":"r41"}]},"stable":{"name":"Q","api":"29","version":"10"},"support":{"name":"Oreo","api":"26","version":"8.0.0"},"preview":{"name":"R","api":"30","version":"11","phase":"Beta 3"}},"linux":{"google":{"versions":["5.4.60","4.19.141","4.14.194","4.9.233","4.4.233","3.18.140"]},"mainline":{"version":"5.9-rc2"}},"toybox":{"stable":{"version":"0.8.0"},"support":{"version":"0.7.3"},"mainline":{"version":"0.8.2"},"master":{"version":"0.8.3"}},"webView":{"stable":{"version":"84.0.4147.125"},"beta":{"version":"85.0.4183.78"}}}
{"version":"2020-08-25 17:05 +0800","android":{"securityPatchLevel":"2020-08-05","build":{"version":"2020-08-03","details":[{"id":"QD4A.200805.003","revision":"r45"},{"id":"QD4A.200805.001","revision":"r44"},{"id":"QQ3A.200805.001","revision":"r41"}]},"stable":{"name":"Q","api":"29","version":"10"},"support":{"name":"Oreo","api":"26","version":"8.0.0"},"preview":{"name":"R","api":"30","version":"11","phase":"Beta 3"}},"linux":{"google":{"versions":["5.4.60","4.19.141","4.14.194","4.9.233","4.4.233","3.18.140"]},"mainline":{"version":"5.9-rc2"}},"toybox":{"stable":{"version":"0.8.0"},"support":{"version":"0.7.3"},"mainline":{"version":"0.8.2"},"master":{"version":"0.8.3"}},"webView":{"stable":{"version":"84.0.4147.125"},"beta":{"version":"85.0.4183.81"}}}
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ data class Lld(
) : BaseInfo()

// https://android.googlesource.com/platform/build/+refs
// https://android.googlesource.com/platform/build/+/refs/tags/android-10.0.0_r41/core/build_id.mk
// https://android.googlesource.com/platform/build/+/refs/tags/android-10.0.0_r45/core/build_id.mk
// https://android.googlesource.com/platform/build/+/master/core/build_id.mk
//
// https://developers.google.com/android/images
Expand Down Expand Up @@ -90,7 +90,7 @@ data class Lld(
// https://android.googlesource.com/platform/system/core/+/master/shell_and_utilities/
@Keep
data class Toyboxes(
// https://android.googlesource.com/platform/external/toybox/+/refs/tags/android-10.0.0_r41/main.c
// https://android.googlesource.com/platform/external/toybox/+/refs/tags/android-10.0.0_r45/main.c
val stable: BaseInfo,
// https://android.googlesource.com/platform/external/toybox/+/refs/tags/android-8.0.0_r49/main.c
val support: BaseInfo,
Expand Down

0 comments on commit 2c7032e

Please sign in to comment.