Skip to content

Add initial support for compiling on macOS #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
felipeerias wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add initial support for compiling on macOS #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions cerbero/bootstrap/android.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,25 @@
from cerbero.config import Distro

NDK_VERSION = 'r27'
NDK_BASE_URL = 'https://dl.google.com/android/repository/android-ndk-%s-%s.zip'
NDK_BASE_URL = 'https://dl.google.com/android/repository/android-ndk-%s-%s.%s'
NDK_CHECKSUMS = {
'android-ndk-r27-linux.zip': '2f17eb8bcbfdc40201c0b36e9a70826fcd2524ab7a2a235e2c71186c302da1dc',
# doesn't ship as a zip file anymore
'android-ndk-r27-darwin.dmg': 'fedc21f8ec973e5d41630536b5a5ac1d2888632cafb6e1f2aa79f0db3eaeda75',
'android-ndk-r27-windows.zip': '342ceafd7581ae26a0bd650a5e0bbcd0aa2ee15eadfd7508b3dedeb1372d7596',
}
NDK_EXTENSIONS = {
'linux': 'zip',
'darwin': 'dmg',
'windows': 'zip',
}


class AndroidBootstrapper(BootstrapperBase):
def __init__(self, config, offline, assume_yes):
super().__init__(config, offline, 'android')
self.prefix = self.config.toolchain_prefix
url = NDK_BASE_URL % (NDK_VERSION, self.config.platform)
ext = NDK_EXTENSIONS.get(self.config.platform, 'zip')
url = NDK_BASE_URL % (NDK_VERSION, self.config.platform, ext)
self.fetch_urls.append((url, None, NDK_CHECKSUMS[os.path.basename(url)]))
self.extract_steps.append((url, True, self.prefix))

Expand Down
21 changes: 18 additions & 3 deletions config/android.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,29 @@ else:
raise FatalError(f'Arch {target_arch} not supported')

if platform == Platform.LINUX:
tc_arch = 'linux-x86_64'
import platform as plat
host_arch = plat.machine()
if host_arch in ['aarch64', 'arm64']:
tc_arch = 'linux-aarch64'
elif host_arch in ['x86_64', 'amd64']:
tc_arch = 'linux-x86_64'
else:
raise FatalError(f'Host architecture {host_arch} is not supported')
elif platform == Platform.DARWIN:
# macOS host - just for querying package info, not for building
import platform as plat
host_arch = plat.machine()
if host_arch == 'arm64':
tc_arch = 'linux-aarch64'
else:
tc_arch = 'linux-x86_64'
else:
raise FatalError(f'Platform {platform} is not supported')
llvm_toolchain_path = f'{toolchain_prefix}/toolchains/llvm/prebuilt/{tc_arch}/bin'
spirv_toolchain_path = f'{toolchain_prefix}/shader-tools/{tc_arch}'

isysroot = f'{toolchain_prefix}/toolchains/llvm/prebuilt/linux-x86_64/sysroot'
sysroot = f'{toolchain_prefix}/toolchains/llvm/prebuilt/linux-x86_64/sysroot'
isysroot = f'{toolchain_prefix}/toolchains/llvm/prebuilt/{tc_arch}/sysroot'
sysroot = f'{toolchain_prefix}/toolchains/llvm/prebuilt/{tc_arch}/sysroot'

# Default compiler flags
env['CFLAGS'] = ''
Expand Down