-
-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'monero-project:master' into master
- Loading branch information
Showing
60 changed files
with
870 additions
and
569 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,15 @@ | ||
| package=android_ndk | ||
| $(package)_version=18b | ||
| $(package)_version=27c | ||
| $(package)_download_path=https://dl.google.com/android/repository/ | ||
| $(package)_file_name=android-ndk-r$($(package)_version)-linux-x86_64.zip | ||
| $(package)_sha256_hash=4f61cbe4bbf6406aa5ef2ae871def78010eed6271af72de83f8bd0b07a9fd3fd | ||
| $(package)_patches=api_definition.patch fix_env.patch | ||
|
|
||
| define $(package)_set_vars | ||
| $(package)_config_opts_arm=--arch arm | ||
| $(package)_config_opts_aarch64=--arch arm64 | ||
| endef | ||
| $(package)_file_name=android-ndk-r$($(package)_version)-linux.zip | ||
| $(package)_sha256_hash=59c2f6dc96743b5daf5d1626684640b20a6bd2b1d85b13156b90333741bad5cc | ||
|
|
||
| define $(package)_extract_cmds | ||
| echo $($(package)_sha256_hash) $($(1)_source_dir)/$($(package)_file_name) | sha256sum -c &&\ | ||
| unzip -q $($(1)_source_dir)/$($(package)_file_name) | ||
| endef | ||
|
|
||
| define $(package)_preprocess_cmds | ||
| cd android-ndk-r$($(package)_version) && \ | ||
| patch -p1 < $($(package)_patch_dir)/api_definition.patch && \ | ||
| patch -p1 < $($(package)_patch_dir)/fix_env.patch | ||
| endef | ||
|
|
||
| define $(package)_stage_cmds | ||
| python3 android-ndk-r$($(package)_version)/build/tools/make_standalone_toolchain.py --api 21 \ | ||
| --install-dir $(build_prefix) --stl=libc++ $($(package)_config_opts) &&\ | ||
| mv $(build_prefix) $($(package)_staging_dir)/$(host_prefix) | ||
| mkdir -p $($(package)_staging_prefix_dir) && \ | ||
| mv android-ndk-r$($(package)_version)/toolchains/llvm/prebuilt/linux-x86_64/* $($(package)_staging_prefix_dir) | ||
| endef | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| OpenSSL's build system tries to be helpful by constructing the compiler name | ||
| for us. This doesn't work with our setup. Instead, we want it to use | ||
| $($(package)_cc), to ensure certain environment flags are unset. | ||
|
|
||
| diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf | ||
| index 41ad9223e0..ea27a3bbba 100644 | ||
| --- a/Configurations/15-android.conf | ||
| +++ b/Configurations/15-android.conf | ||
| @@ -124,17 +124,7 @@ | ||
| $user{RANLIB} = ":"; | ||
| } | ||
| } elsif ($is_standalone_toolchain) { | ||
| - my $cc = $user{CC} // "clang"; | ||
| - # One can probably argue that both clang and gcc should be | ||
| - # probed, but support for "standalone toolchain" was added | ||
| - # *after* announcement that gcc is being phased out, so | ||
| - # favouring clang is considered adequate. Those who insist | ||
| - # have option to enforce test for gcc with CC=gcc. | ||
| - if (which("$triarch-$cc") !~ m|^$ndk|) { | ||
| - die "no NDK $triarch-$cc on \$PATH"; | ||
| - } | ||
| - $user{CC} = $cc; | ||
| - $user{CROSS_COMPILE} = "$triarch-"; | ||
| + | ||
| } elsif ($user{CC} eq "clang") { | ||
| die "no NDK clang on \$PATH"; | ||
| } else { |
Oops, something went wrong.