diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/build.py | 3 | ||||
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 13 | ||||
| -rw-r--r-- | mesonbuild/interpreter/kwargs.py | 1 | ||||
| -rw-r--r-- | mesonbuild/interpreter/type_checking.py | 6 |
4 files changed, 22 insertions, 1 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 4f40a62d0..7320b88fd 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -112,7 +112,7 @@ known_build_target_kwargs = ( rust_kwargs | cs_kwargs) -known_exe_kwargs = known_build_target_kwargs | {'implib', 'export_dynamic', 'pie', 'vs_module_defs'} +known_exe_kwargs = known_build_target_kwargs | {'implib', 'export_dynamic', 'pie', 'vs_module_defs', 'android_exe_type'} known_shlib_kwargs = known_build_target_kwargs | {'version', 'soversion', 'vs_module_defs', 'darwin_versions', 'rust_abi'} known_shmod_kwargs = known_build_target_kwargs | {'vs_module_defs', 'rust_abi'} known_stlib_kwargs = known_build_target_kwargs | {'pic', 'prelink', 'rust_abi'} @@ -1996,6 +1996,7 @@ class Executable(BuildTarget): super().__init__(name, subdir, subproject, for_machine, sources, structured_sources, objects, environment, compilers, kwargs) self.win_subsystem = kwargs.get('win_subsystem') or 'console' + assert kwargs.get('android_exe_type') is None or kwargs.get('android_exe_type') in {'application', 'executable'} # Check for export_dynamic self.export_dynamic = kwargs.get('export_dynamic', False) if not isinstance(self.export_dynamic, bool): diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 2cd272db3..d3bf86df3 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -54,6 +54,7 @@ from .type_checking import ( CT_BUILD_BY_DEFAULT, CT_INPUT_KW, CT_INSTALL_DIR_KW, + _EXCLUSIVE_EXECUTABLE_KWS, EXECUTABLE_KWS, JAR_KWS, LIBRARY_KWS, @@ -1816,12 +1817,24 @@ class Interpreter(InterpreterBase, HoldableObject): def func_disabler(self, node, args, kwargs): return Disabler() + def _strip_exe_specific_kwargs(self, kwargs: kwtypes.Executable) -> kwtypes._BuildTarget: + kwargs = kwargs.copy() + for exe_kwarg in _EXCLUSIVE_EXECUTABLE_KWS: + del kwargs[exe_kwarg.name] + return kwargs + @permittedKwargs(build.known_exe_kwargs) @typed_pos_args('executable', str, varargs=SOURCES_VARARGS) @typed_kwargs('executable', *EXECUTABLE_KWS, allow_unknown=True) def func_executable(self, node: mparser.BaseNode, args: T.Tuple[str, SourcesVarargsType], kwargs: kwtypes.Executable) -> build.Executable: + for_machine = kwargs['native'] + m = self.environment.machines[for_machine] + if m.is_android() and kwargs.get('android_exe_type') == 'application': + holder = self.build_target(node, args, self._strip_exe_specific_kwargs(kwargs), build.SharedLibrary) + holder.shared_library_only = True + return holder return self.build_target(node, args, kwargs, build.Executable) @permittedKwargs(build.known_stlib_kwargs) diff --git a/mesonbuild/interpreter/kwargs.py b/mesonbuild/interpreter/kwargs.py index c0b74405f..fb34bbbce 100644 --- a/mesonbuild/interpreter/kwargs.py +++ b/mesonbuild/interpreter/kwargs.py @@ -393,6 +393,7 @@ class Executable(_BuildTarget): pie: T.Optional[bool] vs_module_defs: T.Optional[T.Union[str, File, build.CustomTarget, build.CustomTargetIndex]] win_subsystem: T.Optional[str] + android_exe_type: T.Optional[Literal['application', 'executable']] class _StaticLibMixin(TypedDict): diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py index 1c9953ee4..78938ba9c 100644 --- a/mesonbuild/interpreter/type_checking.py +++ b/mesonbuild/interpreter/type_checking.py @@ -701,6 +701,12 @@ _EXCLUSIVE_EXECUTABLE_KWS: T.List[KwargInfo] = [ convertor=lambda x: x.lower() if isinstance(x, str) else None, validator=_validate_win_subsystem, ), + KwargInfo( + 'android_exe_type', + (str, NoneType), + validator=in_set_validator({'application', 'executable'}), + since='1.8.0' + ), ] # The total list of arguments used by Executable |