Skip to content

Commit

Permalink
Merge pull request #57 from quarkslab/dev
Browse files Browse the repository at this point in the history 
0.3.2 -> 0.3.3
  • Loading branch information
@Ha0ris
Ha0ris authored May 9, 2022
2 parents 332ab86 + a27ed4f commit 5884150
Show file tree
Hide file tree
Showing 10 changed files with 157 additions and 21 deletions.
43 changes: 24 additions & 19 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,30 @@
# Compatible Kernels

| Kernel | x86 | x86_64 | Android version |
|---------------------------------------------------|:------:|:------:|-----------------------|
| 3.10.0+ | ✓ | | 7.0/7.1 (Google Play) |
| 3.18.56+ | ✓ | | 8.0 (Google Play) |
| 3.18.91+ | ✓ | | 8.1 (Google Play) |
| 4.4.124+ | ✓ | ✓ | 9.0 (Google Play) |
| 4.14.112+ | ✓ | ✓ | 9.0 (Google Play) |
| 5.4.36-00815-g3b29042c17b1 | ✓ | ✓ | 10.0 (Google Play) |
| 5.4.43-00621-g90087296b3b1 | ✓ | ✓ | 10.0 (Google Play) |
| 5.4.47-01061-g22e35a1de440 | ✓ | ✓ | 10.0 (Google Play) |
| 5.4.54-android11-0-00619-g476c942d9b3e-ab6722723 | ✓ | ✓ | 11.0 (Google Play) |
| 5.4.61-android11-0-00791-gbad091cc4bf3-ab6833933 | ✓ | ✓ | 11.0 (Google Play) |
| 5.4.61-android11-2-00064-g4271ad6e8ade-ab6991359 | | ✓ | 11.0 (Google Play) |
| 5.10.4-android12-0-03442-gf2684370d34d-ab7068937 | | ✓ | 12.0 (Google Play) |
| 5.10.15-android12-0-01814-gfca78df78ef2-ab7137072 | | ✓ | 12.0 (Google Play) |
| 5.10.21-android12-0-01012-gcc574f0d3698-ab7214561 | | ✓ | 12.0 (Google Play) |
| 5.10.21-android12-0-01145-ge82381ad9a3f-ab7230153 | | ✓ | 12.0 (Google Play) |
| 5.10.35-android12-4-00865-gd9d0c09e0a3b-ab7349034 | | ✓ | 12.0 (Google Play) |
| 5.10.43-android12-6-00231-g54e7412d4ff9-ab7460289 | | ✓ | 12.0 (Google Play) |
| Kernel | x86 | x86_64 | Android version |
|----------------------------------------------------|:------:|:------:|------------------------------|
| 3.10.0+ | ✓ | | 7.0 / 7.1 |
| 3.18.56+ | ✓ | | 8.0 |
| 3.18.91+ | ✓ | | 8.1 |
| 4.4.124+ | ✓ | ✓ | 9.0 |
| 4.14.112+ | ✓ | ✓ | 9.0 + 10.0 (TV / Automotive) |
| 5.4.36-00815-g3b29042c17b1 | ✓ | ✓ | 10.0 |
| 5.4.43-00621-g90087296b3b1 | ✓ | ✓ | 10.0 |
| 5.4.47-01061-g22e35a1de440 | ✓ | ✓ | 10.0 |
| 5.4.54-android11-0-00619-g476c942d9b3e-ab6722723 | ✓ | ✓ | 11.0 |
| 5.4.61-android11-0-00791-gbad091cc4bf3-ab6833933 | ✓ | ✓ | 11.0 |
| 5.4.61-android11-2-00064-g4271ad6e8ade-ab6991359 | | ✓ | 11.0 |
| 5.4.86-android11-2-00006-gae78026f427c-ab7595864 | | ✓ | 11.0 (Automotive) |
| 5.4.86-android11-2-00040-g29b2beadc627-ab7157994 | ✓ | ✓ | 11.0 (TV / Automotive) |
| 5.10.4-android12-0-03442-gf2684370d34d-ab7068937 | | ✓ | 12.0 |
| 5.10.15-android12-0-01814-gfca78df78ef2-ab7137072 | | ✓ | 12.0 |
| 5.10.21-android12-0-01012-gcc574f0d3698-ab7214561 | | ✓ | 12.0 |
| 5.10.21-android12-0-01145-ge82381ad9a3f-ab7230153 | | ✓ | 12.0 |
| 5.10.35-android12-4-00865-gd9d0c09e0a3b-ab7349034 | | ✓ | 12.0 |
| 5.10.43-android12-6-00231-g54e7412d4ff9-ab7460289 | | ✓ | 12.0 |
| 5.10.43-android12-9-00001-ga30f38980440-ab7882141 | | ✓ | 12.0 |
| 5.10.66-android12-9-00022-g2d6a43c0364d-ab7992900 | ✓ | | 12.0 (TV) |
| 5.10.102-android13-0-00549-g255b30f804ac-ab8238117 | ✓ | ✓ | 13.0 + 13.0 (TV) |

# Requirements

Expand Down
2 changes: 1 addition & 1 deletion aeroot/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
AERoot module
"""

__version__ = "0.3.2"
__version__ = "0.3.3"
7 changes: 6 additions & 1 deletion aeroot/avd.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,12 @@ def kernel(self):
config_name = "{}.yaml".format(self.device.shell("uname -rm").replace(" ", "_").strip())
root_path = Path(__file__).resolve().parent.parent

return Kernel.load(root_path / "config" / "kernel" / config_name, self.device)
try:
kernel = Kernel.load(root_path / "config" / "kernel" / config_name, self.device)
except FileNotFoundError:
raise AVDError("Kernel is not supported")

return kernel


@property
Expand Down
18 changes: 18 additions & 0 deletions config/kernel/5.10.102-android13-0-00549-g255b30f804ac-ab8238117_i686.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: 5.10.102-android13-0-00549-g255b30f804ac-ab8238117 i686
arch: x86_64
sizeof:
address: 8
enforce: 1
task:
offset:
comm: 1784
parent: 1320
tasklist: 1048
creds: 1768
pid: 1304
mem_range:
begin: 18446744071562067968
end: 18446744073441116160
offset:
swapper: 53711536
selinux: 57316048
18 changes: 18 additions & 0 deletions config/kernel/5.10.102-android13-0-00549-g255b30f804ac-ab8238117_x86_64.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: 5.10.102-android13-0-00549-g255b30f804ac-ab8238117 x86_64
arch: x86_64
sizeof:
address: 8
enforce: 1
task:
offset:
comm: 1784
parent: 1320
tasklist: 1048
creds: 1768
pid: 1304
mem_range:
begin: 18446744071562067968
end: 18446744073441116160
offset:
swapper: 53711536
selinux: 57316048
18 changes: 18 additions & 0 deletions config/kernel/5.10.43-android12-9-00001-ga30f38980440-ab7882141_x86_64.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: 5.10.43-android12-9-00001-ga30f38980440-ab7882141 x86_64
arch: x86_64
sizeof:
address: 8
enforce: 1
task:
offset:
comm: 1784
parent: 1320
tasklist: 1048
creds: 1768
pid: 1304
mem_range:
begin: 18446744071562067968
end: 18446744073441116160
offset:
swapper: 44124592
selinux: 48789952
18 changes: 18 additions & 0 deletions config/kernel/5.10.66-android12-9-00022-g2d6a43c0364d-ab7992900_i686.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: 5.10.66-android12-9-00022-g2d6a43c0364d-ab7992900 i686
arch: x86_64
sizeof:
address: 8
enforce: 1
task:
offset:
comm: 1784
parent: 1320
tasklist: 1048
creds: 1768
pid: 1304
mem_range:
begin: 18446744071562067968
end: 18446744073441116160
offset:
swapper: 44124592
selinux: 48802304
18 changes: 18 additions & 0 deletions config/kernel/5.4.86-android11-2-00006-gae78026f427c-ab7595864_x86_64.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: 5.4.86-android11-2-00006-gae78026f427c-ab7595864 x86_64
arch: x86_64
sizeof:
address: 8
enforce: 1
task:
offset:
comm: 1808
parent: 1368
tasklist: 1096
creds: 1792
pid: 1352
mem_range:
begin: 18446744071562067968
end: 18446744073441116160
offset:
swapper: 31621376
selinux: 34712345
18 changes: 18 additions & 0 deletions config/kernel/5.4.86-android11-2-00040-g29b2beadc627-ab7157994_i686.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: 5.4.86-android11-2-00040-g29b2beadc627-ab7157994 i686
arch: x86_64
sizeof:
address: 8
enforce: 1
task:
offset:
comm: 1808
parent: 1368
tasklist: 1096
creds: 1792
pid: 1352
mem_range:
begin: 18446744071562067968
end: 18446744073441116160
offset:
swapper: 31620864
selinux: 34716441
18 changes: 18 additions & 0 deletions config/kernel/5.4.86-android11-2-00040-g29b2beadc627-ab7157994_x86_64.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: 5.4.86-android11-2-00040-g29b2beadc627-ab7157994 x86_64
arch: x86_64
sizeof:
address: 8
enforce: 1
task:
offset:
comm: 1808
parent: 1368
tasklist: 1096
creds: 1792
pid: 1352
mem_range:
begin: 18446744071562067968
end: 18446744073441116160
offset:
swapper: 31620864
selinux: 34716441

0 comments on commit 5884150

Please sign in to comment.