Skip to content
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

Jump to bottom

Update Android to r23b image #64567

Merged
merged 10 commits into from
Feb 8, 2022
Merged

Update Android to r23b image #64567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d94defb
Update Android to r23b image
directhex Jan 31, 2022
b45850d
Don't use flag unavailable in r23b
directhex Feb 1, 2022
f317c24
Merge remote-tracking branch 'origin/main' into update-android-ndk-r23b
directhex Feb 1, 2022
9660394
🤷
directhex Feb 2, 2022
2f3416f
Merge branch 'update-android-ndk-r23b' of github.com:directhex/runtim…
directhex Feb 2, 2022
2c245cd
Merge remote-tracking branch 'origin/main' into update-android-ndk-r23b
directhex Feb 2, 2022
f11b38a
Merge remote-tracking branch 'origin/main' into update-android-ndk-r23b
directhex Feb 3, 2022
4e28462
Merge branch 'update-android-ndk-r23b' of github.com:directhex/runtim…
directhex Feb 3, 2022
443f7f1
Merge remote-tracking branch 'origin/main' into update-android-ndk-r23b
directhex Feb 7, 2022
7ddc234
Merge remote-tracking branch 'origin/main' into update-android-ndk-r23b
directhex Feb 8, 2022
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
8 changes: 4 additions & 4 deletions eng/pipelines/common/platform-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ jobs:
targetRid: android-x64
platform: Android_x64
container:
image: ubuntu-18.04-android-20200422191843-e2c3f83
image: ubuntu-18.04-android-20220131172314-3983b4e
registry: mcr
jobParameters:
runtimeFlavor: mono
Expand All @@ -396,7 +396,7 @@ jobs:
targetRid: android-x86
platform: Android_x86
container:
image: ubuntu-18.04-android-20200422191843-e2c3f83
image: ubuntu-18.04-android-20220131172314-3983b4e
registry: mcr
jobParameters:
runtimeFlavor: mono
Expand All @@ -420,7 +420,7 @@ jobs:
targetRid: android-arm
platform: Android_arm
container:
image: ubuntu-18.04-android-20200422191843-e2c3f83
image: ubuntu-18.04-android-20220131172314-3983b4e
registry: mcr
jobParameters:
runtimeFlavor: mono
Expand All @@ -444,7 +444,7 @@ jobs:
targetRid: android-arm64
platform: Android_arm64
container:
image: ubuntu-18.04-android-20200422191843-e2c3f83
image: ubuntu-18.04-android-20220131172314-3983b4e
registry: mcr
jobParameters:
runtimeFlavor: mono
Expand Down
10 changes: 0 additions & 10 deletions src/tasks/AndroidAppBuilder/Templates/CMakeLists-android.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,6 @@ project(monodroid)

enable_language(C ASM)

if(NOT USE_LLVM)
# the assembler code we generate is GNU which isn't understood by llvm
add_compile_options(-no-integrated-as)
endif()

# Prevent the warning: shared library text segment is not shareable which is treated as an error
if (NOT ANDROID_ABI STREQUAL "arm64-v8a")
add_link_options(-Wl,--no-warn-shared-textrel)
endif()

add_library(
monodroid
SHARED
Expand Down