Skip to content

Commit 2cf5118

Browse files
committed
revert generate_sysroot.py
1 parent a5c36d6 commit 2cf5118

File tree

1 file changed

+5
-17
lines changed

1 file changed

+5
-17
lines changed

engine/src/flutter/ci/tizen/generate_sysroot.py

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,20 @@
3232

3333

3434
def generate_sysroot(sysroot: Path, api_version: float, arch: str, quiet=False):
35-
target = 'standard'
36-
3735
if arch == 'arm':
3836
tizen_arch = 'armv7l'
3937
elif arch == 'arm64':
4038
tizen_arch = 'aarch64'
4139
elif arch == 'x86':
4240
tizen_arch = 'i686'
43-
target = 'emulator'
44-
elif arch == 'x64':
45-
tizen_arch = 'x86_64'
46-
target = 'emulator'
4741
else:
4842
sys.exit('Unknown arch: ' + arch)
4943

5044
base_repo = 'http://download.tizen.org/snapshots/TIZEN/Tizen-{}/Tizen-{}-Base/latest/repos/standard/packages'.format(
5145
api_version, api_version
5246
)
53-
unified_repo = 'http://download.tizen.org/snapshots/TIZEN/Tizen-{}/Tizen-{}-Unified/latest/repos/{}/packages'.format(
54-
api_version, api_version, target
47+
unified_repo = 'http://download.tizen.org/snapshots/TIZEN/Tizen-{}/Tizen-{}-Unified/latest/repos/standard/packages'.format(
48+
api_version, api_version
5549
)
5650

5751
# Retrieve html documents.
@@ -97,11 +91,11 @@ def generate_sysroot(sysroot: Path, api_version: float, arch: str, quiet=False):
9791
if not asm.exists():
9892
os.symlink('asm-' + arch, asm)
9993
pkgconfig = sysroot / 'usr' / 'lib' / 'pkgconfig'
100-
if (arch == 'arm64' or arch == 'x64') and not pkgconfig.exists():
94+
if (arch == 'arm64') and not pkgconfig.exists():
10195
os.symlink('../lib64/pkgconfig', pkgconfig)
10296

10397
# Copy objects required by the linker, such as crtbeginS.o and libgcc.a.
104-
if arch == 'arm64' or arch == 'x64':
98+
if arch == 'arm64':
10599
libpath = sysroot / 'usr' / 'lib64'
106100
else:
107101
libpath = sysroot / 'usr' / 'lib'
@@ -141,13 +135,7 @@ def main():
141135
outpath = Path(__file__).parent / 'sysroot'
142136
outpath.mkdir(exist_ok=True)
143137

144-
arches = ['arm', 'arm64', 'x86']
145-
if args.api_version >= 10.0:
146-
arches = ['arm', 'arm64', 'x64']
147-
elif args.api_version >= 8.0:
148-
arches = ['arm', 'arm64', 'x86', 'x64']
149-
150-
for arch in arches:
138+
for arch in ['arm', 'arm64', 'x86']:
151139
sysroot = outpath / arch
152140
if args.force and sysroot.is_dir():
153141
shutil.rmtree(sysroot)

0 commit comments

Comments
 (0)