Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • G GLib
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 862
    • Issues 862
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 41
    • Merge requests 41
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • GNOMEGNOME
  • GLib
  • Merge requests
  • !1875

build: Fix Android host system checks for cross compilation

  • Review changes

  • Download
  • Email patches
  • Plain diff
Closed Vilius Sutkus 89 requested to merge ViliusSutkus89/glib:android-host-system-check into master Jan 12, 2021
  • Overview 2
  • Commits 2
  • Pipelines 1
  • Changes 6

When building for Android, host_system is "android-$abi", for example 'android-x86_64'. host_system == 'android' would not detect this, because 'android' != 'android-x86_64'.

@oleavr, I assume you (cross,)compiled differently than I did, but my change would still cover your use case. 'android'.startswith('android') may look inefficient and ugly, but it still returns true, so your build shouldn't break.

Intentionally left out a check in meson.build#L345 from this merge request, because it is being removed in !1874 (closed) .

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: android-host-system-check