diff --git a/config.gradle b/config.gradle index a4755f41..e18818ca 100644 --- a/config.gradle +++ b/config.gradle @@ -1,6 +1,6 @@ ext { versions = [ - gradlePluginVersion : '8.2.0', + gradlePluginVersion : '8.2.1', compileSdk : 34, minSdk : 21, targetSdk : 34, diff --git a/plugin/build.gradle b/plugin/build.gradle index 00ed6d45..569ecafa 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -115,7 +115,7 @@ android { khronosDebug.jniLibs.srcDirs += ['src/main/libs/debug/x86_64'] khronosRelease.jniLibs.srcDirs += ['src/main/libs/release/x86_64'] - lynx.jniLibs.srcDirs += ['../thirdparty/lynx_openxr_sdk'] + lynx.jniLibs.srcDirs += ["${khronosOpenxrLoaderTargetDir}/arm64-v8a"] magicleap.jniLibs.srcDirs += [ "${khronosOpenxrLoaderTargetDir}/arm64-v8a", diff --git a/thirdparty/lynx_openxr_sdk/LICENSE b/thirdparty/lynx_openxr_sdk/LICENSE deleted file mode 100755 index 9c35012c..00000000 --- a/thirdparty/lynx_openxr_sdk/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by this -license (the "Software") to use, reproduce, display, distribute, execute, and -transmit the Software, and to prepare derivative works of the Software, and to -permit third-parties to whom the Software is furnished to do so, all subject to -the following: - -The copyright notices in the Software and this entire statement, including the -above license grant, this restriction and the following disclaimer, must be -included in all copies of the Software, in whole or in part, and all derivative -works of the Software, unless such copies or derivative works are solely in the -form of machine-executable object code generated by a source language -processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL -THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY -DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/thirdparty/lynx_openxr_sdk/NOTICE.txt b/thirdparty/lynx_openxr_sdk/NOTICE.txt deleted file mode 100755 index dad7ebee..00000000 --- a/thirdparty/lynx_openxr_sdk/NOTICE.txt +++ /dev/null @@ -1,309 +0,0 @@ -===================================================================================== - -This file contains certain notices of software components included with the software that Qualcomm Technologies, Inc. ("QTI") and/or its subsidiaries are required to provide you. Except where prohibited by the open source license, the content of this file is provided solely to satisfy QTI's and/or its subsidiaries’ attribution and notice requirements, and your use of these software components together with the software of QTI and/or its subsidiaries ("Software") is subject to the terms of your license from QTI and/or its subsidiaries, as the case may be. Compliance with all copyright laws and software license agreements included in the notice section of this file are the responsibility of the user. Except as may be granted by separate express written agreement, this file provides no license to any patents, trademarks, copyrights, or other intellectual property of Qualcomm Incorporated or any of its subsidiaries. - -Software provided with this notice is NOT A CONTRIBUTION to any open source project. If alternative licensing is available for any of the components with licenses or attributions provided below, a license choice is made for receiving such code by QTI and/or its subsidiaries, as the case may be. - -Copyright (c) 2021-2022 of Qualcomm Technologies, Inc. All rights reserved. - -Qualcomm is a trademark of Qualcomm Incorporated, registered in the United States and other countries. All Qualcomm Incorporated trademarks are used with permission. Other products and brand names may be trademarks or registered trademarks of their respective owners. - -This software may be subject to U.S. and international export, re-export or transfer (export) laws. Diversion contrary to U.S. and international law is strictly prohibited. - -===================================================================================== -"Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors -Distributed under MIT license, or public domain if desired and -recognized in your jurisdiction. -See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE" -"Copyright 2007-2011 Baptiste Lepilleur and The JsonCpp Authors -Copyright (C) 2016 InfoTeCS JSC. All rights reserved. -Distributed under MIT license, or public domain if desired and -recognized in your jurisdiction. -See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE" -"Copyright 2011 Baptiste Lepilleur and The JsonCpp Authors -Distributed under MIT license, or public domain if desired and -recognized in your jurisdiction. -See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE" -license : 'Public Domain', -"Copyright (c) 2017 The Khronos Group Inc. - -Licensed under the Apache License, Version 2.0 (the ""License""); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an ""AS IS"" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License." -"Copyright (c) 2017-2021, The Khronos Group Inc. - -SPDX-License-Identifier: Apache-2.0 - -Licensed under the Apache License, Version 2.0 (the ""License""); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an ""AS IS"" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License." -"Copyright (c) 2020 The Khronos Group Inc. -SPDX-License-Identifier: Apache-2.0" -"Copyright 2000-2020 Kitware, Inc. and Contributors -All rights reserved. - -SPDX-License-Identifier: BSD-3-Clause - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - -Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. - -Neither the name of Kitware, Inc. nor the names of Contributors -may be used to endorse or promote products derived from this -software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -""AS IS"" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -"Copyright (c) 2018-2019 Valve Corporation -Copyright (c) 2018-2019 LunarG, Inc. - -SPDX-License-Identifier: Apache-2.0 - -Licensed under the Apache License, Version 2.0 (the ""License""); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an ""AS IS"" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License." -"Copyright 2020 Collabora, Ltd. -SPDX-License-Identifier: BSL-1.0 -Distributed under the Boost Software License, Version 1.0. -(See accompanying file LICENSE_1_0.txt or copy at -http://www.boost.org/LICENSE_1_0.txt)" -"Copyright (c) 2017 The Khronos Group Inc. - -SPDX-License-Identifier: Apache-2.0" -"Copyright Philippe Crassous 2011. -Copyright Sensics, Inc. 2016. - -SPDX-License-Identifier: BSL-1.0 - -Distributed under the Boost Software License, Version 1.0. -(See accompanying file LICENSE_1_0.txt or copy at -http://www.boost.org/LICENSE_1_0.txt)" -"SPDX-FileCopyrightText: Copyright 2007-2014, 2017 the original author or authors. -SPDX-License-Identifier: Apache-2.0" -"Copyright (c) 2018-2021, The Khronos Group Inc. - -SPDX-License-Identifier: Apache-2.0 OR MIT" -"@rem Copyright 2015 the original author or authors. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem -@rem Licensed under the Apache License, Version 2.0 (the ""License""); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an ""AS IS"" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem" -"SPDX-FileCopyrightText: Copyright 2010 the original author or authors. -SPDX-License-Identifier: Apache-2.0" -"Copyright 2020-2021, Collabora, Ltd. -SPDX-License-Identifier: BSL-1.0 -Author: Ryan Pavlik " -"Copyright 2020, Collabora, Ltd. -SPDX-License-Identifier: BSL-1.0 -Author: Ryan Pavlik " -"Copyright (c) 2017 The Khronos Group Inc. -Copyright (c) 2017 Valve Corporation -Copyright (c) 2017 LunarG, Inc. - -Licensed under the Apache License, Version 2.0 (the ""License""); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an ""AS IS"" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License." -"Copyright (c) 2017 The Khronos Group Inc. -Copyright (c) 2017 Valve Corporation -Copyright (c) 2017 LunarG, Inc. - -SPDX-License-Identifier: Apache-2.0 OR MIT" -"Copyright (c) 2020-2021 The Khronos Group Inc. - -SPDX-License-Identifier: Apache-2.0" -"Copyright 2020-2021, Collabora, Ltd. -SPDX-License-Identifier: BSL-1.0 -Author: Ryan Pavlik -Inline implementations: do not include on its own!" -"Copyright 2010 Baptiste Lepilleur and The JsonCpp Authors -Distributed under MIT license, or public domain if desired and -recognized in your jurisdiction. -See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE" -"Copyright (c) 2017-2021, The Khronos Group Inc. -Copyright (c) 2017-2019 Valve Corporation -Copyright (c) 2017-2019 LunarG, Inc. -Copyright (c) 2019 Collabora, Ltd. - -SPDX-License-Identifier: Apache-2.0 OR MIT" -"Copyright (c) 2017-2021, The Khronos Group Inc. -Copyright (c) 2017 Valve Corporation -Copyright (c) 2017 LunarG, Inc. - -SPDX-License-Identifier: Apache-2.0 OR MIT" -"Copyright (c) 2020 The Khronos Group Inc. -SPDX-License-Identifier: Apache-2.0 ->" -"Copyright (c) 2017-2021, The Khronos Group Inc. -Copyright (c) 2017-2019 Valve Corporation -Copyright (c) 2017-2019 LunarG, Inc. - -SPDX-License-Identifier: Apache-2.0 OR MIT" -"Copyright (c) 2020-2021, The Khronos Group Inc. -Copyright (c) 2020-2021, Collabora, Ltd. - -SPDX-License-Identifier: Apache-2.0 OR MIT" -"Copyright 2015 the original author or authors. - -SPDX-License-Identifier: Apache-2.0 - -Licensed under the Apache License, Version 2.0 (the ""License""); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -https://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an ""AS IS"" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License." -"Copyright (c) 2017-2021, The Khronos Group Inc. - -SPDX-License-Identifier: Apache-2.0" -"Copyright (c) 2017-2021, The Khronos Group Inc. - -SPDX-License-Identifier: Apache-2.0 OR MIT" -"Copyright (c) 2020-2021 The Khronos Group Inc. -SPDX-License-Identifier: Apache-2.0" -"Copyright (c) 2017 The Khronos Group Inc. -Copyright (c) 2016 Oculus VR, LLC. - -SPDX-License-Identifier: Apache-2.0 - -Licensed under the Apache License, Version 2.0 (the ""License""); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an ""AS IS"" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License." -"Copyright (c) 2017 The Khronos Group Inc. - -SPDX-License-Identifier: Apache-2.0 - -Licensed under the Apache License, Version 2.0 (the ""License""); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an ""AS IS"" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License." -"Copyright (c) 2019-2021, The Khronos Group Inc. - -SPDX-License-Identifier: Apache-2.0 OR MIT" -"[Copyright (c) 2017-2021, The Khronos Group Inc. -Copyright (c) 2017-2019 Valve Corporation -Copyright (c) 2017-2019 LunarG, Inc. -SPDX-License-Identifier: Apache-2.0 OR MIT -******* THIS FILE IS GENERATED - DO NOT EDIT ********* -See loader_source_generator.py for modifications]" -"Copyright (c) 2017-2021, The Khronos Group Inc. -Copyright (c) 2017-2019 Valve Corporation -Copyright (c) 2017-2019 LunarG, Inc. - -SPDX-License-Identifier: Apache-2.0 - -Licensed under the Apache License, Version 2.0 (the ""License""); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an ""AS IS"" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License." -url = "http://www.apache.org/licenses/LICENSE-2.0.txt" -"[Copyright (c) 2017-2021, The Khronos Group Inc. -Copyright (c) 2017-2019 Valve Corporation -Copyright (c) 2017-2019 LunarG, Inc. -SPDX-License-Identifier: Apache-2.0 OR MIT -==================================================================================================== -Copyright (c) 2016 Mitchell Dowd - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -==================================================================================================== diff --git a/thirdparty/lynx_openxr_sdk/README.md b/thirdparty/lynx_openxr_sdk/README.md deleted file mode 100644 index 21778051..00000000 --- a/thirdparty/lynx_openxr_sdk/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# Lynx OpenXR SDK - -Binaries taken from Lynx at: -https://portal.lynx-r.com/downloads/item/1/download/latest diff --git a/thirdparty/lynx_openxr_sdk/arm64-v8a/abi.json b/thirdparty/lynx_openxr_sdk/arm64-v8a/abi.json deleted file mode 100644 index 30b37081..00000000 --- a/thirdparty/lynx_openxr_sdk/arm64-v8a/abi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "abi": "arm64-v8a", - "api": 24, - "ndk": 21, - "stl": "c++_shared" -} diff --git a/thirdparty/lynx_openxr_sdk/arm64-v8a/libopenxr_loader.so b/thirdparty/lynx_openxr_sdk/arm64-v8a/libopenxr_loader.so deleted file mode 100644 index 5a7d17b1..00000000 Binary files a/thirdparty/lynx_openxr_sdk/arm64-v8a/libopenxr_loader.so and /dev/null differ