diff options
31 files changed, 513 insertions, 64 deletions
diff --git a/.ci/scripts/android/build.sh b/.ci/scripts/android/build.sh index 1d669919c..a5fd1ee18 100755 --- a/.ci/scripts/android/build.sh +++ b/.ci/scripts/android/build.sh | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | #!/bin/bash -ex | 1 | #!/bin/bash -ex |
| 2 | 2 | ||
| 3 | # SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 4 | # SPDX-License-Identifier: GPL-3.0-or-later | ||
| 5 | |||
| 3 | export NDK_CCACHE="$(which ccache)" | 6 | export NDK_CCACHE="$(which ccache)" |
| 4 | ccache -s | 7 | ccache -s |
| 5 | 8 | ||
diff --git a/.ci/scripts/android/upload.sh b/.ci/scripts/android/upload.sh index 269684178..cfaeff328 100755 --- a/.ci/scripts/android/upload.sh +++ b/.ci/scripts/android/upload.sh | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | #!/bin/bash -ex | 1 | #!/bin/bash -ex |
| 2 | 2 | ||
| 3 | # SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 4 | # SPDX-License-Identifier: GPL-3.0-or-later | ||
| 5 | |||
| 3 | . ./.ci/scripts/common/pre-upload.sh | 6 | . ./.ci/scripts/common/pre-upload.sh |
| 4 | 7 | ||
| 5 | REV_NAME="yuzu-${GITDATE}-${GITREV}" | 8 | REV_NAME="yuzu-${GITDATE}-${GITREV}" |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 298eb4745..9875de206 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml | |||
| @@ -4,11 +4,8 @@ | |||
| 4 | name: 'yuzu verify' | 4 | name: 'yuzu verify' |
| 5 | 5 | ||
| 6 | on: | 6 | on: |
| 7 | push: | ||
| 8 | # branches: [ main ] | ||
| 9 | tags: [ "*" ] | ||
| 10 | pull_request: | 7 | pull_request: |
| 11 | branches: [ main ] | 8 | branches: [ master ] |
| 12 | env: | 9 | env: |
| 13 | PR_NUMBER: pr${{ github.event.number }} | 10 | PR_NUMBER: pr${{ github.event.number }} |
| 14 | 11 | ||
diff --git a/.reuse/dep5 b/.reuse/dep5 index 3810f2c41..31178fc4c 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 | |||
| @@ -135,3 +135,15 @@ License: GPL-3.0-or-later | |||
| 135 | Files: .github/ISSUE_TEMPLATE/* | 135 | Files: .github/ISSUE_TEMPLATE/* |
| 136 | Copyright: 2022 yuzu Emulator Project | 136 | Copyright: 2022 yuzu Emulator Project |
| 137 | License: GPL-2.0-or-later | 137 | License: GPL-2.0-or-later |
| 138 | |||
| 139 | Files: src/android/app/src/ea/res/* | ||
| 140 | Copyright: 2023 yuzu Emulator Project | ||
| 141 | License: GPL-3.0-or-later | ||
| 142 | |||
| 143 | Files: src/android/app/src/main/res/* | ||
| 144 | Copyright: 2023 yuzu Emulator Project | ||
| 145 | License: GPL-3.0-or-later | ||
| 146 | |||
| 147 | Files: src/android/gradle/wrapper/* | ||
| 148 | Copyright: 2023 yuzu Emulator Project | ||
| 149 | License: GPL-3.0-or-later | ||
diff --git a/LICENSES/MPL-2.0.txt b/LICENSES/MPL-2.0.txt new file mode 100644 index 000000000..14e2f777f --- /dev/null +++ b/LICENSES/MPL-2.0.txt | |||
| @@ -0,0 +1,373 @@ | |||
| 1 | Mozilla Public License Version 2.0 | ||
| 2 | ================================== | ||
| 3 | |||
| 4 | 1. Definitions | ||
| 5 | -------------- | ||
| 6 | |||
| 7 | 1.1. "Contributor" | ||
| 8 | means each individual or legal entity that creates, contributes to | ||
| 9 | the creation of, or owns Covered Software. | ||
| 10 | |||
| 11 | 1.2. "Contributor Version" | ||
| 12 | means the combination of the Contributions of others (if any) used | ||
| 13 | by a Contributor and that particular Contributor's Contribution. | ||
| 14 | |||
| 15 | 1.3. "Contribution" | ||
| 16 | means Covered Software of a particular Contributor. | ||
| 17 | |||
| 18 | 1.4. "Covered Software" | ||
| 19 | means Source Code Form to which the initial Contributor has attached | ||
| 20 | the notice in Exhibit A, the Executable Form of such Source Code | ||
| 21 | Form, and Modifications of such Source Code Form, in each case | ||
| 22 | including portions thereof. | ||
| 23 | |||
| 24 | 1.5. "Incompatible With Secondary Licenses" | ||
| 25 | means | ||
| 26 | |||
| 27 | (a) that the initial Contributor has attached the notice described | ||
| 28 | in Exhibit B to the Covered Software; or | ||
| 29 | |||
| 30 | (b) that the Covered Software was made available under the terms of | ||
| 31 | version 1.1 or earlier of the License, but not also under the | ||
| 32 | terms of a Secondary License. | ||
| 33 | |||
| 34 | 1.6. "Executable Form" | ||
| 35 | means any form of the work other than Source Code Form. | ||
| 36 | |||
| 37 | 1.7. "Larger Work" | ||
| 38 | means a work that combines Covered Software with other material, in | ||
| 39 | a separate file or files, that is not Covered Software. | ||
| 40 | |||
| 41 | 1.8. "License" | ||
| 42 | means this document. | ||
| 43 | |||
| 44 | 1.9. "Licensable" | ||
| 45 | means having the right to grant, to the maximum extent possible, | ||
| 46 | whether at the time of the initial grant or subsequently, any and | ||
| 47 | all of the rights conveyed by this License. | ||
| 48 | |||
| 49 | 1.10. "Modifications" | ||
| 50 | means any of the following: | ||
| 51 | |||
| 52 | (a) any file in Source Code Form that results from an addition to, | ||
| 53 | deletion from, or modification of the contents of Covered | ||
| 54 | Software; or | ||
| 55 | |||
| 56 | (b) any new file in Source Code Form that contains any Covered | ||
| 57 | Software. | ||
| 58 | |||
| 59 | 1.11. "Patent Claims" of a Contributor | ||
| 60 | means any patent claim(s), including without limitation, method, | ||
| 61 | process, and apparatus claims, in any patent Licensable by such | ||
| 62 | Contributor that would be infringed, but for the grant of the | ||
| 63 | License, by the making, using, selling, offering for sale, having | ||
| 64 | made, import, or transfer of either its Contributions or its | ||
| 65 | Contributor Version. | ||
| 66 | |||
| 67 | 1.12. "Secondary License" | ||
| 68 | means either the GNU General Public License, Version 2.0, the GNU | ||
| 69 | Lesser General Public License, Version 2.1, the GNU Affero General | ||
| 70 | Public License, Version 3.0, or any later versions of those | ||
| 71 | licenses. | ||
| 72 | |||
| 73 | 1.13. "Source Code Form" | ||
| 74 | means the form of the work preferred for making modifications. | ||
| 75 | |||
| 76 | 1.14. "You" (or "Your") | ||
| 77 | means an individual or a legal entity exercising rights under this | ||
| 78 | License. For legal entities, "You" includes any entity that | ||
| 79 | controls, is controlled by, or is under common control with You. For | ||
| 80 | purposes of this definition, "control" means (a) the power, direct | ||
| 81 | or indirect, to cause the direction or management of such entity, | ||
| 82 | whether by contract or otherwise, or (b) ownership of more than | ||
| 83 | fifty percent (50%) of the outstanding shares or beneficial | ||
| 84 | ownership of such entity. | ||
| 85 | |||
| 86 | 2. License Grants and Conditions | ||
| 87 | -------------------------------- | ||
| 88 | |||
| 89 | 2.1. Grants | ||
| 90 | |||
| 91 | Each Contributor hereby grants You a world-wide, royalty-free, | ||
| 92 | non-exclusive license: | ||
| 93 | |||
| 94 | (a) under intellectual property rights (other than patent or trademark) | ||
| 95 | Licensable by such Contributor to use, reproduce, make available, | ||
| 96 | modify, display, perform, distribute, and otherwise exploit its | ||
| 97 | Contributions, either on an unmodified basis, with Modifications, or | ||
| 98 | as part of a Larger Work; and | ||
| 99 | |||
| 100 | (b) under Patent Claims of such Contributor to make, use, sell, offer | ||
| 101 | for sale, have made, import, and otherwise transfer either its | ||
| 102 | Contributions or its Contributor Version. | ||
| 103 | |||
| 104 | 2.2. Effective Date | ||
| 105 | |||
| 106 | The licenses granted in Section 2.1 with respect to any Contribution | ||
| 107 | become effective for each Contribution on the date the Contributor first | ||
| 108 | distributes such Contribution. | ||
| 109 | |||
| 110 | 2.3. Limitations on Grant Scope | ||
| 111 | |||
| 112 | The licenses granted in this Section 2 are the only rights granted under | ||
| 113 | this License. No additional rights or licenses will be implied from the | ||
| 114 | distribution or licensing of Covered Software under this License. | ||
| 115 | Notwithstanding Section 2.1(b) above, no patent license is granted by a | ||
| 116 | Contributor: | ||
| 117 | |||
| 118 | (a) for any code that a Contributor has removed from Covered Software; | ||
| 119 | or | ||
| 120 | |||
| 121 | (b) for infringements caused by: (i) Your and any other third party's | ||
| 122 | modifications of Covered Software, or (ii) the combination of its | ||
| 123 | Contributions with other software (except as part of its Contributor | ||
| 124 | Version); or | ||
| 125 | |||
| 126 | (c) under Patent Claims infringed by Covered Software in the absence of | ||
| 127 | its Contributions. | ||
| 128 | |||
| 129 | This License does not grant any rights in the trademarks, service marks, | ||
| 130 | or logos of any Contributor (except as may be necessary to comply with | ||
| 131 | the notice requirements in Section 3.4). | ||
| 132 | |||
| 133 | 2.4. Subsequent Licenses | ||
| 134 | |||
| 135 | No Contributor makes additional grants as a result of Your choice to | ||
| 136 | distribute the Covered Software under a subsequent version of this | ||
| 137 | License (see Section 10.2) or under the terms of a Secondary License (if | ||
| 138 | permitted under the terms of Section 3.3). | ||
| 139 | |||
| 140 | 2.5. Representation | ||
| 141 | |||
| 142 | Each Contributor represents that the Contributor believes its | ||
| 143 | Contributions are its original creation(s) or it has sufficient rights | ||
| 144 | to grant the rights to its Contributions conveyed by this License. | ||
| 145 | |||
| 146 | 2.6. Fair Use | ||
| 147 | |||
| 148 | This License is not intended to limit any rights You have under | ||
| 149 | applicable copyright doctrines of fair use, fair dealing, or other | ||
| 150 | equivalents. | ||
| 151 | |||
| 152 | 2.7. Conditions | ||
| 153 | |||
| 154 | Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted | ||
| 155 | in Section 2.1. | ||
| 156 | |||
| 157 | 3. Responsibilities | ||
| 158 | ------------------- | ||
| 159 | |||
| 160 | 3.1. Distribution of Source Form | ||
| 161 | |||
| 162 | All distribution of Covered Software in Source Code Form, including any | ||
| 163 | Modifications that You create or to which You contribute, must be under | ||
| 164 | the terms of this License. You must inform recipients that the Source | ||
| 165 | Code Form of the Covered Software is governed by the terms of this | ||
| 166 | License, and how they can obtain a copy of this License. You may not | ||
| 167 | attempt to alter or restrict the recipients' rights in the Source Code | ||
| 168 | Form. | ||
| 169 | |||
| 170 | 3.2. Distribution of Executable Form | ||
| 171 | |||
| 172 | If You distribute Covered Software in Executable Form then: | ||
| 173 | |||
| 174 | (a) such Covered Software must also be made available in Source Code | ||
| 175 | Form, as described in Section 3.1, and You must inform recipients of | ||
| 176 | the Executable Form how they can obtain a copy of such Source Code | ||
| 177 | Form by reasonable means in a timely manner, at a charge no more | ||
| 178 | than the cost of distribution to the recipient; and | ||
| 179 | |||
| 180 | (b) You may distribute such Executable Form under the terms of this | ||
| 181 | License, or sublicense it under different terms, provided that the | ||
| 182 | license for the Executable Form does not attempt to limit or alter | ||
| 183 | the recipients' rights in the Source Code Form under this License. | ||
| 184 | |||
| 185 | 3.3. Distribution of a Larger Work | ||
| 186 | |||
| 187 | You may create and distribute a Larger Work under terms of Your choice, | ||
| 188 | provided that You also comply with the requirements of this License for | ||
| 189 | the Covered Software. If the Larger Work is a combination of Covered | ||
| 190 | Software with a work governed by one or more Secondary Licenses, and the | ||
| 191 | Covered Software is not Incompatible With Secondary Licenses, this | ||
| 192 | License permits You to additionally distribute such Covered Software | ||
| 193 | under the terms of such Secondary License(s), so that the recipient of | ||
| 194 | the Larger Work may, at their option, further distribute the Covered | ||
| 195 | Software under the terms of either this License or such Secondary | ||
| 196 | License(s). | ||
| 197 | |||
| 198 | 3.4. Notices | ||
| 199 | |||
| 200 | You may not remove or alter the substance of any license notices | ||
| 201 | (including copyright notices, patent notices, disclaimers of warranty, | ||
| 202 | or limitations of liability) contained within the Source Code Form of | ||
| 203 | the Covered Software, except that You may alter any license notices to | ||
| 204 | the extent required to remedy known factual inaccuracies. | ||
| 205 | |||
| 206 | 3.5. Application of Additional Terms | ||
| 207 | |||
| 208 | You may choose to offer, and to charge a fee for, warranty, support, | ||
| 209 | indemnity or liability obligations to one or more recipients of Covered | ||
| 210 | Software. However, You may do so only on Your own behalf, and not on | ||
| 211 | behalf of any Contributor. You must make it absolutely clear that any | ||
| 212 | such warranty, support, indemnity, or liability obligation is offered by | ||
| 213 | You alone, and You hereby agree to indemnify every Contributor for any | ||
| 214 | liability incurred by such Contributor as a result of warranty, support, | ||
| 215 | indemnity or liability terms You offer. You may include additional | ||
| 216 | disclaimers of warranty and limitations of liability specific to any | ||
| 217 | jurisdiction. | ||
| 218 | |||
| 219 | 4. Inability to Comply Due to Statute or Regulation | ||
| 220 | --------------------------------------------------- | ||
| 221 | |||
| 222 | If it is impossible for You to comply with any of the terms of this | ||
| 223 | License with respect to some or all of the Covered Software due to | ||
| 224 | statute, judicial order, or regulation then You must: (a) comply with | ||
| 225 | the terms of this License to the maximum extent possible; and (b) | ||
| 226 | describe the limitations and the code they affect. Such description must | ||
| 227 | be placed in a text file included with all distributions of the Covered | ||
| 228 | Software under this License. Except to the extent prohibited by statute | ||
| 229 | or regulation, such description must be sufficiently detailed for a | ||
| 230 | recipient of ordinary skill to be able to understand it. | ||
| 231 | |||
| 232 | 5. Termination | ||
| 233 | -------------- | ||
| 234 | |||
| 235 | 5.1. The rights granted under this License will terminate automatically | ||
| 236 | if You fail to comply with any of its terms. However, if You become | ||
| 237 | compliant, then the rights granted under this License from a particular | ||
| 238 | Contributor are reinstated (a) provisionally, unless and until such | ||
| 239 | Contributor explicitly and finally terminates Your grants, and (b) on an | ||
| 240 | ongoing basis, if such Contributor fails to notify You of the | ||
| 241 | non-compliance by some reasonable means prior to 60 days after You have | ||
| 242 | come back into compliance. Moreover, Your grants from a particular | ||
| 243 | Contributor are reinstated on an ongoing basis if such Contributor | ||
| 244 | notifies You of the non-compliance by some reasonable means, this is the | ||
| 245 | first time You have received notice of non-compliance with this License | ||
| 246 | from such Contributor, and You become compliant prior to 30 days after | ||
| 247 | Your receipt of the notice. | ||
| 248 | |||
| 249 | 5.2. If You initiate litigation against any entity by asserting a patent | ||
| 250 | infringement claim (excluding declaratory judgment actions, | ||
| 251 | counter-claims, and cross-claims) alleging that a Contributor Version | ||
| 252 | directly or indirectly infringes any patent, then the rights granted to | ||
| 253 | You by any and all Contributors for the Covered Software under Section | ||
| 254 | 2.1 of this License shall terminate. | ||
| 255 | |||
| 256 | 5.3. In the event of termination under Sections 5.1 or 5.2 above, all | ||
| 257 | end user license agreements (excluding distributors and resellers) which | ||
| 258 | have been validly granted by You or Your distributors under this License | ||
| 259 | prior to termination shall survive termination. | ||
| 260 | |||
| 261 | ************************************************************************ | ||
| 262 | * * | ||
| 263 | * 6. Disclaimer of Warranty * | ||
| 264 | * ------------------------- * | ||
| 265 | * * | ||
| 266 | * Covered Software is provided under this License on an "as is" * | ||
| 267 | * basis, without warranty of any kind, either expressed, implied, or * | ||
| 268 | * statutory, including, without limitation, warranties that the * | ||
| 269 | * Covered Software is free of defects, merchantable, fit for a * | ||
| 270 | * particular purpose or non-infringing. The entire risk as to the * | ||
| 271 | * quality and performance of the Covered Software is with You. * | ||
| 272 | * Should any Covered Software prove defective in any respect, You * | ||
| 273 | * (not any Contributor) assume the cost of any necessary servicing, * | ||
| 274 | * repair, or correction. This disclaimer of warranty constitutes an * | ||
| 275 | * essential part of this License. No use of any Covered Software is * | ||
| 276 | * authorized under this License except under this disclaimer. * | ||
| 277 | * * | ||
| 278 | ************************************************************************ | ||
| 279 | |||
| 280 | ************************************************************************ | ||
| 281 | * * | ||
| 282 | * 7. Limitation of Liability * | ||
| 283 | * -------------------------- * | ||
| 284 | * * | ||
| 285 | * Under no circumstances and under no legal theory, whether tort * | ||
| 286 | * (including negligence), contract, or otherwise, shall any * | ||
| 287 | * Contributor, or anyone who distributes Covered Software as * | ||
| 288 | * permitted above, be liable to You for any direct, indirect, * | ||
| 289 | * special, incidental, or consequential damages of any character * | ||
| 290 | * including, without limitation, damages for lost profits, loss of * | ||
| 291 | * goodwill, work stoppage, computer failure or malfunction, or any * | ||
| 292 | * and all other commercial damages or losses, even if such party * | ||
| 293 | * shall have been informed of the possibility of such damages. This * | ||
| 294 | * limitation of liability shall not apply to liability for death or * | ||
| 295 | * personal injury resulting from such party's negligence to the * | ||
| 296 | * extent applicable law prohibits such limitation. Some * | ||
| 297 | * jurisdictions do not allow the exclusion or limitation of * | ||
| 298 | * incidental or consequential damages, so this exclusion and * | ||
| 299 | * limitation may not apply to You. * | ||
| 300 | * * | ||
| 301 | ************************************************************************ | ||
| 302 | |||
| 303 | 8. Litigation | ||
| 304 | ------------- | ||
| 305 | |||
| 306 | Any litigation relating to this License may be brought only in the | ||
| 307 | courts of a jurisdiction where the defendant maintains its principal | ||
| 308 | place of business and such litigation shall be governed by laws of that | ||
| 309 | jurisdiction, without reference to its conflict-of-law provisions. | ||
| 310 | Nothing in this Section shall prevent a party's ability to bring | ||
| 311 | cross-claims or counter-claims. | ||
| 312 | |||
| 313 | 9. Miscellaneous | ||
| 314 | ---------------- | ||
| 315 | |||
| 316 | This License represents the complete agreement concerning the subject | ||
| 317 | matter hereof. If any provision of this License is held to be | ||
| 318 | unenforceable, such provision shall be reformed only to the extent | ||
| 319 | necessary to make it enforceable. Any law or regulation which provides | ||
| 320 | that the language of a contract shall be construed against the drafter | ||
| 321 | shall not be used to construe this License against a Contributor. | ||
| 322 | |||
| 323 | 10. Versions of the License | ||
| 324 | --------------------------- | ||
| 325 | |||
| 326 | 10.1. New Versions | ||
| 327 | |||
| 328 | Mozilla Foundation is the license steward. Except as provided in Section | ||
| 329 | 10.3, no one other than the license steward has the right to modify or | ||
| 330 | publish new versions of this License. Each version will be given a | ||
| 331 | distinguishing version number. | ||
| 332 | |||
| 333 | 10.2. Effect of New Versions | ||
| 334 | |||
| 335 | You may distribute the Covered Software under the terms of the version | ||
| 336 | of the License under which You originally received the Covered Software, | ||
| 337 | or under the terms of any subsequent version published by the license | ||
| 338 | steward. | ||
| 339 | |||
| 340 | 10.3. Modified Versions | ||
| 341 | |||
| 342 | If you create software not governed by this License, and you want to | ||
| 343 | create a new license for such software, you may create and use a | ||
| 344 | modified version of this License if you rename the license and remove | ||
| 345 | any references to the name of the license steward (except to note that | ||
| 346 | such modified license differs from this License). | ||
| 347 | |||
| 348 | 10.4. Distributing Source Code Form that is Incompatible With Secondary | ||
| 349 | Licenses | ||
| 350 | |||
| 351 | If You choose to distribute Source Code Form that is Incompatible With | ||
| 352 | Secondary Licenses under the terms of this version of the License, the | ||
| 353 | notice described in Exhibit B of this License must be attached. | ||
| 354 | |||
| 355 | Exhibit A - Source Code Form License Notice | ||
| 356 | ------------------------------------------- | ||
| 357 | |||
| 358 | This Source Code Form is subject to the terms of the Mozilla Public | ||
| 359 | License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| 360 | file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
| 361 | |||
| 362 | If it is not possible or desirable to put the notice in a particular | ||
| 363 | file, then You may include the notice in a location (such as a LICENSE | ||
| 364 | file in a relevant directory) where a recipient would be likely to look | ||
| 365 | for such a notice. | ||
| 366 | |||
| 367 | You may add additional accurate notices of copyright ownership. | ||
| 368 | |||
| 369 | Exhibit B - "Incompatible With Secondary Licenses" Notice | ||
| 370 | --------------------------------------------------------- | ||
| 371 | |||
| 372 | This Source Code Form is "Incompatible With Secondary Licenses", as | ||
| 373 | defined by the Mozilla Public License, v. 2.0. | ||
diff --git a/src/android/.gitignore b/src/android/.gitignore index 40b6c5cd0..121cc8484 100644 --- a/src/android/.gitignore +++ b/src/android/.gitignore | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 2 | # SPDX-License-Identifier: GPL-3.0-or-later | ||
| 3 | |||
| 1 | # Built application files | 4 | # Built application files |
| 2 | *.apk | 5 | *.apk |
| 3 | *.ap_ | 6 | *.ap_ |
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index 4aa19c91a..ec5f78746 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | // SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-3.0-or-later | ||
| 3 | |||
| 1 | plugins { | 4 | plugins { |
| 2 | id("com.android.application") | 5 | id("com.android.application") |
| 3 | id("org.jetbrains.kotlin.android") | 6 | id("org.jetbrains.kotlin.android") |
diff --git a/src/android/app/proguard-rules.pro b/src/android/app/proguard-rules.pro index 13cfff1ba..691e08fd0 100644 --- a/src/android/app/proguard-rules.pro +++ b/src/android/app/proguard-rules.pro | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 2 | # SPDX-License-Identifier: GPL-3.0-or-later | ||
| 3 | |||
| 1 | # To get usable stack traces | 4 | # To get usable stack traces |
| 2 | -dontobfuscate | 5 | -dontobfuscate |
| 3 | 6 | ||
diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml index aed7f9dc4..43087f2c0 100644 --- a/src/android/app/src/main/AndroidManifest.xml +++ b/src/android/app/src/main/AndroidManifest.xml | |||
| @@ -1,4 +1,10 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | |||
| 3 | <!-- | ||
| 4 | SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 5 | SPDX-License-Identifier: GPL-3.0-or-later | ||
| 6 | --> | ||
| 7 | |||
| 2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android"> | 8 | <manifest xmlns:android="http://schemas.android.com/apk/res/android"> |
| 3 | <uses-feature | 9 | <uses-feature |
| 4 | android:name="android.hardware.touchscreen" | 10 | android:name="android.hardware.touchscreen" |
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeViewModel.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeViewModel.kt index b959ae4ba..263ee7144 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeViewModel.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeViewModel.kt | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | // SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-3.0-or-later | ||
| 3 | |||
| 1 | package org.yuzu.yuzu_emu.model | 4 | package org.yuzu.yuzu_emu.model |
| 2 | 5 | ||
| 3 | import androidx.lifecycle.LiveData | 6 | import androidx.lifecycle.LiveData |
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt index 95f358c21..f0b0af9e5 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt | |||
| @@ -866,9 +866,9 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(context | |||
| 866 | * Initializes an [InputOverlayDrawableDpad] | 866 | * Initializes an [InputOverlayDrawableDpad] |
| 867 | * | 867 | * |
| 868 | * @param context The current [Context]. | 868 | * @param context The current [Context]. |
| 869 | * @param defaultResId The [Bitmap] resource ID of the default sate. | 869 | * @param defaultResId The [Bitmap] resource ID of the default state. |
| 870 | * @param pressedOneDirectionResId The [Bitmap] resource ID of the pressed sate in one direction. | 870 | * @param pressedOneDirectionResId The [Bitmap] resource ID of the pressed state in one direction. |
| 871 | * @param pressedTwoDirectionsResId The [Bitmap] resource ID of the pressed sate in two directions. | 871 | * @param pressedTwoDirectionsResId The [Bitmap] resource ID of the pressed state in two directions. |
| 872 | * @return the initialized [InputOverlayDrawableDpad] | 872 | * @return the initialized [InputOverlayDrawableDpad] |
| 873 | */ | 873 | */ |
| 874 | private fun initializeOverlayDpad( | 874 | private fun initializeOverlayDpad( |
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt index 78b978fb5..24e999b29 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | // SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-3.0-or-later | ||
| 3 | |||
| 1 | package org.yuzu.yuzu_emu.utils | 4 | package org.yuzu.yuzu_emu.utils |
| 2 | 5 | ||
| 3 | import android.view.KeyEvent | 6 | import android.view.KeyEvent |
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InsetsHelper.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InsetsHelper.kt index e587fea06..19c53c481 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InsetsHelper.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InsetsHelper.kt | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | // SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-3.0-or-later | ||
| 3 | |||
| 1 | package org.yuzu.yuzu_emu.utils | 4 | package org.yuzu.yuzu_emu.utils |
| 2 | 5 | ||
| 3 | import android.annotation.SuppressLint | 6 | import android.annotation.SuppressLint |
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NfcReader.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NfcReader.kt index 1ce220d42..344dd8a0a 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NfcReader.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NfcReader.kt | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | // SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-3.0-or-later | ||
| 3 | |||
| 1 | package org.yuzu.yuzu_emu.utils | 4 | package org.yuzu.yuzu_emu.utils |
| 2 | 5 | ||
| 3 | import android.app.Activity | 6 | import android.app.Activity |
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/SerializableHelper.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/SerializableHelper.kt index 23ffbaf68..87ee7f2e6 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/SerializableHelper.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/SerializableHelper.kt | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | // SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-3.0-or-later | ||
| 3 | |||
| 1 | package org.yuzu.yuzu_emu.utils | 4 | package org.yuzu.yuzu_emu.utils |
| 2 | 5 | ||
| 3 | import android.content.Intent | 6 | import android.content.Intent |
diff --git a/src/android/app/src/main/jni/CMakeLists.txt b/src/android/app/src/main/jni/CMakeLists.txt index 3cf36b7d1..041781577 100644 --- a/src/android/app/src/main/jni/CMakeLists.txt +++ b/src/android/app/src/main/jni/CMakeLists.txt | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 2 | # SPDX-License-Identifier: GPL-3.0-or-later | ||
| 3 | |||
| 1 | add_library(yuzu-android SHARED | 4 | add_library(yuzu-android SHARED |
| 2 | android_common/android_common.cpp | 5 | android_common/android_common.cpp |
| 3 | android_common/android_common.h | 6 | android_common/android_common.h |
diff --git a/src/android/app/src/main/jni/applets/software_keyboard.cpp b/src/android/app/src/main/jni/applets/software_keyboard.cpp index c6fffbbab..74e040478 100644 --- a/src/android/app/src/main/jni/applets/software_keyboard.cpp +++ b/src/android/app/src/main/jni/applets/software_keyboard.cpp | |||
| @@ -263,9 +263,9 @@ void InitJNI(JNIEnv* env) { | |||
| 263 | s_software_keyboard_class, "executeNormal", | 263 | s_software_keyboard_class, "executeNormal", |
| 264 | "(Lorg/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)Lorg/yuzu/yuzu_emu/" | 264 | "(Lorg/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)Lorg/yuzu/yuzu_emu/" |
| 265 | "applets/keyboard/SoftwareKeyboard$KeyboardData;"); | 265 | "applets/keyboard/SoftwareKeyboard$KeyboardData;"); |
| 266 | s_swkbd_execute_inline = | 266 | s_swkbd_execute_inline = env->GetStaticMethodID( |
| 267 | env->GetStaticMethodID(s_software_keyboard_class, "executeInline", | 267 | s_software_keyboard_class, "executeInline", |
| 268 | "(Lorg/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)V"); | 268 | "(Lorg/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard$KeyboardConfig;)V"); |
| 269 | } | 269 | } |
| 270 | 270 | ||
| 271 | void CleanupJNI(JNIEnv* env) { | 271 | void CleanupJNI(JNIEnv* env) { |
diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cpp index 6b4c08145..2d622a048 100644 --- a/src/android/app/src/main/jni/config.cpp +++ b/src/android/app/src/main/jni/config.cpp | |||
| @@ -232,7 +232,8 @@ void Config::ReadValues() { | |||
| 232 | Settings::values.accelerate_astc = config->GetBoolean("Renderer", "accelerate_astc", false); | 232 | Settings::values.accelerate_astc = config->GetBoolean("Renderer", "accelerate_astc", false); |
| 233 | 233 | ||
| 234 | // Enable asynchronous presentation by default on Android | 234 | // Enable asynchronous presentation by default on Android |
| 235 | Settings::values.async_presentation = config->GetBoolean("Renderer", "async_presentation", true); | 235 | Settings::values.async_presentation = |
| 236 | config->GetBoolean("Renderer", "async_presentation", true); | ||
| 236 | 237 | ||
| 237 | // Enable force_max_clock by default on Android | 238 | // Enable force_max_clock by default on Android |
| 238 | Settings::values.renderer_force_max_clock = | 239 | Settings::values.renderer_force_max_clock = |
diff --git a/src/android/app/src/main/jni/emu_window/emu_window.cpp b/src/android/app/src/main/jni/emu_window/emu_window.cpp index 926bb30e8..a890c6604 100644 --- a/src/android/app/src/main/jni/emu_window/emu_window.cpp +++ b/src/android/app/src/main/jni/emu_window/emu_window.cpp | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | // SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-3.0-or-later | ||
| 3 | |||
| 1 | #include <android/native_window_jni.h> | 4 | #include <android/native_window_jni.h> |
| 2 | 5 | ||
| 3 | #include "common/logging/log.h" | 6 | #include "common/logging/log.h" |
diff --git a/src/android/app/src/main/jni/emu_window/emu_window.h b/src/android/app/src/main/jni/emu_window/emu_window.h index 36d46eb51..b38087f73 100644 --- a/src/android/app/src/main/jni/emu_window/emu_window.h +++ b/src/android/app/src/main/jni/emu_window/emu_window.h | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | // SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-3.0-or-later | ||
| 3 | |||
| 1 | #pragma once | 4 | #pragma once |
| 2 | 5 | ||
| 3 | #include <memory> | 6 | #include <memory> |
diff --git a/src/android/app/src/main/jni/id_cache.cpp b/src/android/app/src/main/jni/id_cache.cpp index 7edadb94a..9cbbf23a3 100644 --- a/src/android/app/src/main/jni/id_cache.cpp +++ b/src/android/app/src/main/jni/id_cache.cpp | |||
| @@ -107,7 +107,7 @@ void JNI_OnUnload(JavaVM* vm, void* reserved) { | |||
| 107 | env->DeleteGlobalRef(s_disk_cache_progress_class); | 107 | env->DeleteGlobalRef(s_disk_cache_progress_class); |
| 108 | env->DeleteGlobalRef(s_load_callback_stage_class); | 108 | env->DeleteGlobalRef(s_load_callback_stage_class); |
| 109 | 109 | ||
| 110 | // UnInitialze applets | 110 | // UnInitialize applets |
| 111 | SoftwareKeyboard::CleanupJNI(env); | 111 | SoftwareKeyboard::CleanupJNI(env); |
| 112 | } | 112 | } |
| 113 | 113 | ||
diff --git a/src/android/app/src/main/jni/id_cache.h b/src/android/app/src/main/jni/id_cache.h index 9337cd254..be535fe1e 100644 --- a/src/android/app/src/main/jni/id_cache.h +++ b/src/android/app/src/main/jni/id_cache.h | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | // SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-3.0-or-later | ||
| 3 | |||
| 1 | #pragma once | 4 | #pragma once |
| 2 | 5 | ||
| 3 | #include <jni.h> | 6 | #include <jni.h> |
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index a7321af2a..bbe6abdb0 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp | |||
| @@ -37,8 +37,8 @@ | |||
| 37 | #include "core/frontend/applets/profile_select.h" | 37 | #include "core/frontend/applets/profile_select.h" |
| 38 | #include "core/frontend/applets/software_keyboard.h" | 38 | #include "core/frontend/applets/software_keyboard.h" |
| 39 | #include "core/frontend/applets/web_browser.h" | 39 | #include "core/frontend/applets/web_browser.h" |
| 40 | #include "core/hid/hid_core.h" | ||
| 41 | #include "core/hid/emulated_controller.h" | 40 | #include "core/hid/emulated_controller.h" |
| 41 | #include "core/hid/hid_core.h" | ||
| 42 | #include "core/hid/hid_types.h" | 42 | #include "core/hid/hid_types.h" |
| 43 | #include "core/hle/service/acc/profile_manager.h" | 43 | #include "core/hle/service/acc/profile_manager.h" |
| 44 | #include "core/hle/service/am/applet_ae.h" | 44 | #include "core/hle/service/am/applet_ae.h" |
| @@ -276,7 +276,7 @@ public: | |||
| 276 | m_rom_metadata_cache.clear(); | 276 | m_rom_metadata_cache.clear(); |
| 277 | } | 277 | } |
| 278 | 278 | ||
| 279 | bool IsHandheldOnly(){ | 279 | bool IsHandheldOnly() { |
| 280 | const auto npad_style_set = m_system.HIDCore().GetSupportedStyleTag(); | 280 | const auto npad_style_set = m_system.HIDCore().GetSupportedStyleTag(); |
| 281 | 281 | ||
| 282 | if (npad_style_set.fullkey == 1) { | 282 | if (npad_style_set.fullkey == 1) { |
| @@ -290,42 +290,43 @@ public: | |||
| 290 | return !Settings::values.use_docked_mode.GetValue(); | 290 | return !Settings::values.use_docked_mode.GetValue(); |
| 291 | } | 291 | } |
| 292 | 292 | ||
| 293 | void SetDeviceType(int index, int type){ | 293 | void SetDeviceType(int index, int type) { |
| 294 | auto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index); | 294 | auto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index); |
| 295 | controller->SetNpadStyleIndex(static_cast<Core::HID::NpadStyleIndex>(type)); | 295 | controller->SetNpadStyleIndex(static_cast<Core::HID::NpadStyleIndex>(type)); |
| 296 | } | 296 | } |
| 297 | 297 | ||
| 298 | void OnGamepadConnectEvent(int index){ | 298 | void OnGamepadConnectEvent(int index) { |
| 299 | auto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index); | 299 | auto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index); |
| 300 | 300 | ||
| 301 | // Ensure that player1 is configured correctly and handheld disconnected | 301 | // Ensure that player1 is configured correctly and handheld disconnected |
| 302 | if(controller->GetNpadIdType() == Core::HID::NpadIdType::Player1){ | 302 | if (controller->GetNpadIdType() == Core::HID::NpadIdType::Player1) { |
| 303 | auto handheld = m_system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld); | 303 | auto handheld = |
| 304 | 304 | m_system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld); | |
| 305 | if(controller->GetNpadStyleIndex() == Core::HID::NpadStyleIndex::Handheld) { | 305 | |
| 306 | handheld->SetNpadStyleIndex(Core::HID::NpadStyleIndex::ProController); | 306 | if (controller->GetNpadStyleIndex() == Core::HID::NpadStyleIndex::Handheld) { |
| 307 | controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::ProController); | 307 | handheld->SetNpadStyleIndex(Core::HID::NpadStyleIndex::ProController); |
| 308 | handheld->Disconnect(); | 308 | controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::ProController); |
| 309 | } | 309 | handheld->Disconnect(); |
| 310 | } | ||
| 310 | } | 311 | } |
| 311 | 312 | ||
| 312 | // Ensure that handheld is configured correctly and player 1 disconnected | 313 | // Ensure that handheld is configured correctly and player 1 disconnected |
| 313 | if(controller->GetNpadIdType() == Core::HID::NpadIdType::Handheld){ | 314 | if (controller->GetNpadIdType() == Core::HID::NpadIdType::Handheld) { |
| 314 | auto player1 = m_system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1); | 315 | auto player1 = m_system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1); |
| 315 | 316 | ||
| 316 | if(controller->GetNpadStyleIndex() != Core::HID::NpadStyleIndex::Handheld) { | 317 | if (controller->GetNpadStyleIndex() != Core::HID::NpadStyleIndex::Handheld) { |
| 317 | player1->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Handheld); | 318 | player1->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Handheld); |
| 318 | controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Handheld); | 319 | controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Handheld); |
| 319 | player1->Disconnect(); | 320 | player1->Disconnect(); |
| 320 | } | 321 | } |
| 321 | } | 322 | } |
| 322 | 323 | ||
| 323 | if(!controller->IsConnected()){ | 324 | if (!controller->IsConnected()) { |
| 324 | controller->Connect(); | 325 | controller->Connect(); |
| 325 | } | 326 | } |
| 326 | } | 327 | } |
| 327 | 328 | ||
| 328 | void OnGamepadDisconnectEvent(int index){ | 329 | void OnGamepadDisconnectEvent(int index) { |
| 329 | auto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index); | 330 | auto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index); |
| 330 | controller->Disconnect(); | 331 | controller->Disconnect(); |
| 331 | } | 332 | } |
| @@ -497,14 +498,13 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isRunning([[maybe_unused]] JNIEnv | |||
| 497 | } | 498 | } |
| 498 | 499 | ||
| 499 | jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isHandheldOnly([[maybe_unused]] JNIEnv* env, | 500 | jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isHandheldOnly([[maybe_unused]] JNIEnv* env, |
| 500 | [[maybe_unused]] jclass clazz) { | 501 | [[maybe_unused]] jclass clazz) { |
| 501 | return EmulationSession::GetInstance().IsHandheldOnly(); | 502 | return EmulationSession::GetInstance().IsHandheldOnly(); |
| 502 | } | 503 | } |
| 503 | 504 | ||
| 504 | jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_setDeviceType([[maybe_unused]] JNIEnv* env, | 505 | jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_setDeviceType([[maybe_unused]] JNIEnv* env, |
| 505 | [[maybe_unused]] jclass clazz, | 506 | [[maybe_unused]] jclass clazz, |
| 506 | jint j_device, | 507 | jint j_device, jint j_type) { |
| 507 | jint j_type) { | ||
| 508 | if (EmulationSession::GetInstance().IsRunning()) { | 508 | if (EmulationSession::GetInstance().IsRunning()) { |
| 509 | EmulationSession::GetInstance().SetDeviceType(j_device, j_type); | 509 | EmulationSession::GetInstance().SetDeviceType(j_device, j_type); |
| 510 | } | 510 | } |
| @@ -512,17 +512,16 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_setDeviceType([[maybe_unused]] JN | |||
| 512 | } | 512 | } |
| 513 | 513 | ||
| 514 | jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadConnectEvent([[maybe_unused]] JNIEnv* env, | 514 | jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadConnectEvent([[maybe_unused]] JNIEnv* env, |
| 515 | [[maybe_unused]] jclass clazz, | 515 | [[maybe_unused]] jclass clazz, |
| 516 | jint j_device) { | 516 | jint j_device) { |
| 517 | if (EmulationSession::GetInstance().IsRunning()) { | 517 | if (EmulationSession::GetInstance().IsRunning()) { |
| 518 | EmulationSession::GetInstance().OnGamepadConnectEvent(j_device); | 518 | EmulationSession::GetInstance().OnGamepadConnectEvent(j_device); |
| 519 | } | 519 | } |
| 520 | return static_cast<jboolean>(true); | 520 | return static_cast<jboolean>(true); |
| 521 | } | 521 | } |
| 522 | 522 | ||
| 523 | jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadDisconnectEvent([[maybe_unused]] JNIEnv* env, | 523 | jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadDisconnectEvent( |
| 524 | [[maybe_unused]] jclass clazz, | 524 | [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint j_device) { |
| 525 | jint j_device) { | ||
| 526 | if (EmulationSession::GetInstance().IsRunning()) { | 525 | if (EmulationSession::GetInstance().IsRunning()) { |
| 527 | EmulationSession::GetInstance().OnGamepadDisconnectEvent(j_device); | 526 | EmulationSession::GetInstance().OnGamepadDisconnectEvent(j_device); |
| 528 | } | 527 | } |
| @@ -562,10 +561,11 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadMotionEvent( | |||
| 562 | return static_cast<jboolean>(true); | 561 | return static_cast<jboolean>(true); |
| 563 | } | 562 | } |
| 564 | 563 | ||
| 565 | jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag( | 564 | jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag([[maybe_unused]] JNIEnv* env, |
| 566 | [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jbyteArray j_data) { | 565 | [[maybe_unused]] jclass clazz, |
| 566 | jbyteArray j_data) { | ||
| 567 | jboolean isCopy{false}; | 567 | jboolean isCopy{false}; |
| 568 | std::span<u8> data(reinterpret_cast<u8 *>(env->GetByteArrayElements(j_data, &isCopy)), | 568 | std::span<u8> data(reinterpret_cast<u8*>(env->GetByteArrayElements(j_data, &isCopy)), |
| 569 | static_cast<size_t>(env->GetArrayLength(j_data))); | 569 | static_cast<size_t>(env->GetArrayLength(j_data))); |
| 570 | 570 | ||
| 571 | if (EmulationSession::GetInstance().IsRunning()) { | 571 | if (EmulationSession::GetInstance().IsRunning()) { |
| @@ -574,8 +574,8 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag( | |||
| 574 | return static_cast<jboolean>(true); | 574 | return static_cast<jboolean>(true); |
| 575 | } | 575 | } |
| 576 | 576 | ||
| 577 | jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onRemoveNfcTag( | 577 | jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onRemoveNfcTag([[maybe_unused]] JNIEnv* env, |
| 578 | [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz) { | 578 | [[maybe_unused]] jclass clazz) { |
| 579 | if (EmulationSession::GetInstance().IsRunning()) { | 579 | if (EmulationSession::GetInstance().IsRunning()) { |
| 580 | EmulationSession::GetInstance().Window().OnRemoveNfcTag(); | 580 | EmulationSession::GetInstance().Window().OnRemoveNfcTag(); |
| 581 | } | 581 | } |
diff --git a/src/android/app/src/main/jni/native.h b/src/android/app/src/main/jni/native.h index d1e382a33..24dcbbcb8 100644 --- a/src/android/app/src/main/jni/native.h +++ b/src/android/app/src/main/jni/native.h | |||
| @@ -25,17 +25,19 @@ JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_ResetRomMetadata(JN | |||
| 25 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_IsRunning(JNIEnv* env, | 25 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_IsRunning(JNIEnv* env, |
| 26 | jclass clazz); | 26 | jclass clazz); |
| 27 | 27 | ||
| 28 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_isHandheldOnly( | 28 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_isHandheldOnly(JNIEnv* env, |
| 29 | JNIEnv* env, jclass clazz); | 29 | jclass clazz); |
| 30 | 30 | ||
| 31 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_setDeviceType( | 31 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_setDeviceType(JNIEnv* env, |
| 32 | JNIEnv* env, jclass clazz, jstring j_device, jstring j_type); | 32 | jclass clazz, |
| 33 | jstring j_device, | ||
| 34 | jstring j_type); | ||
| 33 | 35 | ||
| 34 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadConnectEvent( | 36 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadConnectEvent( |
| 35 | JNIEnv* env, jclass clazz, jstring j_device); | 37 | JNIEnv* env, jclass clazz, jstring j_device); |
| 36 | 38 | ||
| 37 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadDisconnectEvent( | 39 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadDisconnectEvent( |
| 38 | JNIEnv* env, jclass clazz, jstring j_device); | 40 | JNIEnv* env, jclass clazz, jstring j_device); |
| 39 | 41 | ||
| 40 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadEvent( | 42 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadEvent( |
| 41 | JNIEnv* env, jclass clazz, jstring j_device, jint j_button, jint action); | 43 | JNIEnv* env, jclass clazz, jstring j_device, jint j_button, jint action); |
| @@ -44,13 +46,14 @@ JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadMoveEv | |||
| 44 | JNIEnv* env, jclass clazz, jstring j_device, jint axis, jfloat x, jfloat y); | 46 | JNIEnv* env, jclass clazz, jstring j_device, jint axis, jfloat x, jfloat y); |
| 45 | 47 | ||
| 46 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadAxisEvent( | 48 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadAxisEvent( |
| 47 | JNIEnv* env, jclass clazz, jstring j_device, jint axis_id, jfloat axis_val); | 49 | JNIEnv* env, jclass clazz, jstring j_device, jint axis_id, jfloat axis_val); |
| 48 | 50 | ||
| 49 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag( | 51 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag(JNIEnv* env, |
| 50 | JNIEnv* env, jclass clazz, jbyteArray j_data); | 52 | jclass clazz, |
| 53 | jbyteArray j_data); | ||
| 51 | 54 | ||
| 52 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onRemoveNfcTag( | 55 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onRemoveNfcTag(JNIEnv* env, |
| 53 | JNIEnv* env, jclass clazz); | 56 | jclass clazz); |
| 54 | 57 | ||
| 55 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchEvent(JNIEnv* env, | 58 | JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchEvent(JNIEnv* env, |
| 56 | jclass clazz, | 59 | jclass clazz, |
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index dd1137b69..cffa3ff0b 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml | |||
| @@ -78,7 +78,7 @@ | |||
| 78 | <string name="open_user_folder_description">Manage yuzu\'s internal files</string> | 78 | <string name="open_user_folder_description">Manage yuzu\'s internal files</string> |
| 79 | <string name="theme_and_color_description">Modify the look of the app</string> | 79 | <string name="theme_and_color_description">Modify the look of the app</string> |
| 80 | <string name="no_file_manager">No file manager found</string> | 80 | <string name="no_file_manager">No file manager found</string> |
| 81 | <string name="notification_no_directory_link">Couldn\'t open yuzu directory</string> | 81 | <string name="notification_no_directory_link">Could not open yuzu directory</string> |
| 82 | <string name="notification_no_directory_link_description">Please locate the user folder with the file manager\'s side panel manually.</string> | 82 | <string name="notification_no_directory_link_description">Please locate the user folder with the file manager\'s side panel manually.</string> |
| 83 | 83 | ||
| 84 | <!-- About screen strings --> | 84 | <!-- About screen strings --> |
| @@ -249,7 +249,7 @@ | |||
| 249 | <string name="language_latin_american_spanish">Latin American Spanish (Español latinoamericano)</string> | 249 | <string name="language_latin_american_spanish">Latin American Spanish (Español latinoamericano)</string> |
| 250 | <string name="language_simplified_chinese">Simplified Chinese (简体中文)</string> | 250 | <string name="language_simplified_chinese">Simplified Chinese (简体中文)</string> |
| 251 | <string name="language_traditional_chinese">Traditional Chinese (正體中文)</string> | 251 | <string name="language_traditional_chinese">Traditional Chinese (正體中文)</string> |
| 252 | <string name="language_brazilian_portuguese">Brazilian Portuguese (Portugues do Brasil)</string> | 252 | <string name="language_brazilian_portuguese">Brazilian Portuguese (Português do Brasil)</string> |
| 253 | 253 | ||
| 254 | <!-- Renderer APIs --> | 254 | <!-- Renderer APIs --> |
| 255 | <string name="renderer_vulkan">Vulkan</string> | 255 | <string name="renderer_vulkan">Vulkan</string> |
diff --git a/src/android/build.gradle.kts b/src/android/build.gradle.kts index 1ed9aed9a..e19e8ce58 100644 --- a/src/android/build.gradle.kts +++ b/src/android/build.gradle.kts | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | // SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-3.0-or-later | ||
| 3 | |||
| 1 | // Top-level build file where you can add configuration options common to all sub-projects/modules. | 4 | // Top-level build file where you can add configuration options common to all sub-projects/modules. |
| 2 | plugins { | 5 | plugins { |
| 3 | id("com.android.application") version "8.0.2" apply false | 6 | id("com.android.application") version "8.0.2" apply false |
diff --git a/src/android/gradle.properties b/src/android/gradle.properties index bf63cfce7..653a35ce8 100644 --- a/src/android/gradle.properties +++ b/src/android/gradle.properties | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 2 | # SPDX-License-Identifier: GPL-3.0-or-later | ||
| 3 | |||
| 1 | # Project-wide Gradle settings. | 4 | # Project-wide Gradle settings. |
| 2 | # IDE (e.g. Android Studio) users: | 5 | # IDE (e.g. Android Studio) users: |
| 3 | # Gradle settings configured through the IDE *will override* | 6 | # Gradle settings configured through the IDE *will override* |
diff --git a/src/android/gradlew b/src/android/gradlew index cccdd3d51..afa127966 100755 --- a/src/android/gradlew +++ b/src/android/gradlew | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | #!/usr/bin/env sh | 1 | #!/usr/bin/env sh |
| 2 | 2 | ||
| 3 | # SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 4 | # SPDX-License-Identifier: GPL-3.0-or-later | ||
| 5 | |||
| 3 | ############################################################################## | 6 | ############################################################################## |
| 4 | ## | 7 | ## |
| 5 | ## Gradle start up script for UN*X | 8 | ## Gradle start up script for UN*X |
diff --git a/src/android/gradlew.bat b/src/android/gradlew.bat index f9553162f..be152d108 100644 --- a/src/android/gradlew.bat +++ b/src/android/gradlew.bat | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | @rem SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 2 | @rem SPDX-License-Identifier: GPL-3.0-or-later | ||
| 3 | |||
| 1 | @if "%DEBUG%" == "" @echo off | 4 | @if "%DEBUG%" == "" @echo off |
| 2 | @rem ########################################################################## | 5 | @rem ########################################################################## |
| 3 | @rem | 6 | @rem |
diff --git a/src/android/settings.gradle.kts b/src/android/settings.gradle.kts index 1fb82df41..af910b906 100644 --- a/src/android/settings.gradle.kts +++ b/src/android/settings.gradle.kts | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | // SPDX-FileCopyrightText: 2023 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-3.0-or-later | ||
| 3 | |||
| 1 | pluginManagement { | 4 | pluginManagement { |
| 2 | repositories { | 5 | repositories { |
| 3 | gradlePluginPortal() | 6 | gradlePluginPortal() |
diff --git a/src/input_common/drivers/virtual_amiibo.cpp b/src/input_common/drivers/virtual_amiibo.cpp index 9505179c6..c08f21e2c 100644 --- a/src/input_common/drivers/virtual_amiibo.cpp +++ b/src/input_common/drivers/virtual_amiibo.cpp | |||
| @@ -107,19 +107,19 @@ VirtualAmiibo::Info VirtualAmiibo::LoadAmiibo(std::span<u8> data) { | |||
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | switch (data.size_bytes()) { | 109 | switch (data.size_bytes()) { |
| 110 | case AmiiboSize: | 110 | case AmiiboSize: |
| 111 | case AmiiboSizeWithoutPassword: | 111 | case AmiiboSizeWithoutPassword: |
| 112 | nfc_data.resize(AmiiboSize); | 112 | nfc_data.resize(AmiiboSize); |
| 113 | break; | 113 | break; |
| 114 | case MifareSize: | 114 | case MifareSize: |
| 115 | nfc_data.resize(MifareSize); | 115 | nfc_data.resize(MifareSize); |
| 116 | break; | 116 | break; |
| 117 | default: | 117 | default: |
| 118 | return Info::NotAnAmiibo; | 118 | return Info::NotAnAmiibo; |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | state = State::AmiiboIsOpen; | 121 | state = State::AmiiboIsOpen; |
| 122 | memcpy(nfc_data.data(),data.data(),data.size_bytes()); | 122 | memcpy(nfc_data.data(), data.data(), data.size_bytes()); |
| 123 | SetNfc(identifier, {Common::Input::NfcState::NewAmiibo, nfc_data}); | 123 | SetNfc(identifier, {Common::Input::NfcState::NewAmiibo, nfc_data}); |
| 124 | return Info::Success; | 124 | return Info::Success; |
| 125 | } | 125 | } |