From 7b3cf21a1a051f4989e000f3212abd12505ee905 Mon Sep 17 00:00:00 2001 From: Vishal Bhoj Date: Wed, 4 Oct 2017 22:12:32 +0530 Subject: self-extractors_hikey960: update to extract hw codec components Remove arm specific bits since we host libraries in git repository. Add hisilicon decoder libraries Change-Id: Ic70cf9dd96579589dbffda390ac8dc913370e95a Signed-off-by: Vishal Bhoj Signed-off-by: John Stultz --- self-extractors_hikey960/arm/COPYRIGHT | 1 - self-extractors_hikey960/arm/LICENSE | 177 --------------------- .../arm/staging/BoardConfigPartial.mk | 13 -- .../arm/staging/device-partial.mk | 20 --- self-extractors_hikey960/extract-lists.txt | 18 ++- self-extractors_hikey960/hisilicon/COPYRIGHT | 1 + self-extractors_hikey960/hisilicon/LICENSE | 126 +++++++++++++++ .../hisilicon/staging/BoardConfigPartial.mk | 13 ++ .../hisilicon/staging/device-partial.mk | 32 ++++ self-extractors_hikey960/root/device-vendor.mk | 2 +- 10 files changed, 188 insertions(+), 215 deletions(-) delete mode 100644 self-extractors_hikey960/arm/COPYRIGHT delete mode 100644 self-extractors_hikey960/arm/LICENSE delete mode 100644 self-extractors_hikey960/arm/staging/BoardConfigPartial.mk delete mode 100644 self-extractors_hikey960/arm/staging/device-partial.mk create mode 100644 self-extractors_hikey960/hisilicon/COPYRIGHT create mode 100644 self-extractors_hikey960/hisilicon/LICENSE create mode 100644 self-extractors_hikey960/hisilicon/staging/BoardConfigPartial.mk create mode 100644 self-extractors_hikey960/hisilicon/staging/device-partial.mk (limited to 'self-extractors_hikey960') diff --git a/self-extractors_hikey960/arm/COPYRIGHT b/self-extractors_hikey960/arm/COPYRIGHT deleted file mode 100644 index c627c1a1..00000000 --- a/self-extractors_hikey960/arm/COPYRIGHT +++ /dev/null @@ -1 +0,0 @@ -# (C) ARM Limited. diff --git a/self-extractors_hikey960/arm/LICENSE b/self-extractors_hikey960/arm/LICENSE deleted file mode 100644 index 4a8cdd56..00000000 --- a/self-extractors_hikey960/arm/LICENSE +++ /dev/null @@ -1,177 +0,0 @@ -THIS END USER LICENCE AGREEMENT ("LICENCE") IS A LEGAL AGREEMENT -BETWEEN YOU (EITHER A SINGLE INDIVIDUAL, OR SINGLE LEGAL ENTITY) AND -ARM LIMITED ("ARM") FOR THE USE OF THE SOFTWARE ACCOMPANYING THIS -LICENCE. ARM IS ONLY WILLING TO LICENSE THE SOFTWARE TO YOU ON -CONDITION THAT YOU ACCEPT ALL OF THE TERMS IN THIS LICENCE. BY -CLICKING "I AGREE" OR BY INSTALLING OR OTHERWISE USING OR COPYING THE -SOFTWARE YOU INDICATE THAT YOU AGREE TO BE BOUND BY ALL OF THE TERMS -OF THIS LICENCE. IF YOU DO NOT AGREE TO THE TERMS OF THIS LICENCE, ARM -IS UNWILLING TO LICENSE THE SOFTWARE TO YOU AND YOU MAY NOT INSTALL, -USE OR COPY THE SOFTWARE, AND YOU SHOULD PROMPTLY RETURN THE SOFTWARE -TO YOUR SUPPLIER. - -"Software" means any software, firmware and data accompanying this -Licence, any printed, electronic or online documentation supplied with -it under the terms of this Licence for the MALI GPU Driver. - - 1. LICENCE GRANTS TO YOU. - - 1.1 ARM hereby grants to you, subject to the terms and conditions of - this Licence, a non-exclusive, non-transferable, revocable, worldwide - licence to: (i) use the Software or certain components or optional - functionality in the Software, as applicable, solely for the purposes - of designing or developing applications for use in conjunction with - MALI GPU based products manufactured under licence from ARM; and (ii) - modify the Software or certain components or optional functionality in - the Software for the purposes of porting the Software to your target; - - 2. RESTRICTIONS ON USE OF THE SOFTWARE. - - COPYING: You shall not use or copy the Software except as expressly - authorised in this Licence. You may make one additional copy of the - delivered Software for backup or archival purposes. - - BENCHMARKING: This Licence does not prevent you from using the - Software for internal benchmarking purposes. However, you shall treat - any and all benchmarking data relating to the Software, and any other - results of your use or testing of the Software which are indicative of - its performance, efficacy, reliability or quality, as confidential - information and you shall not disclose such information to any third - party without the express written permission of ARM. - - COPYRIGHT AND RESERVATION OF RIGHTS: The Software is owned by ARM or - its licensors and is protected by copyright and other intellectual - property laws and international treaties. The Software is licensed not - sold. You acquire no rights to the Software other than as expressly - provided by this Licence. You shall not remove from the Software any - copyright notice or other notice and shall ensure that any such notice - is reproduced in any copies of the whole or any part of the Software - made by you or other permitted users. - - REVERSE ENGINEERING: Except to the extent that such activity is - permitted by applicable law you shall not reverse engineer, decompile - or disassemble any of the Software. If the Software was provided to - you in Europe you shall not reverse engineer, decompile or disassemble - any of the Software for the purposes of error correction. - - 3. SUPPORT. - - ARM is not under an obligation to provide support, but it may do so at - its own discretion, and if it does, it will only be in respect of the - Software as delivered and not any modifications thereto. - - 4. NO WARRANTIES. - - YOU AGREE THAT THE SOFTWARE IS LICENSED "AS IS", AND THAT ARM - EXPRESSLY DISCLAIMS ALL REPRESENTATIONS, WARRANTIES, CONDITIONS OR - OTHER TERMS, EXPRESS OR IMPLIED OR STATUTORY, INCLUDING WITHOUT - LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, SATISFACTORY - QUALITY, AND FITNESS FOR A PARTICULAR PURPOSE. - - YOU EXPRESSLY ASSUME ALL LIABILITIES AND RISKS, FOR USE OR OPERATION - OF SOFTWARE APPLICATIONS, INCLUDING WITHOUT LIMITATION, SOFTWARE - APPLICATIONS DESIGNED OR INTENDED FOR MISSION CRITICAL APPLICATIONS, - SUCH AS PACEMAKERS, WEAPONRY, AIRCRAFT NAVIGATION, FACTORY CONTROL - SYSTEMS, ETC. SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU ASSUME THE - ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 5. LIMITATION OF LIABILITY. - - TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL - ARM BE LIABLE FOR ANY INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL - DAMAGES (INCLUDING LOSS OF PROFITS) ARISING OUT OF THE USE OR - INABILITY TO USE THE SOFTWARE WHETHER BASED ON A CLAIM UNDER CONTRACT, - TORT OR OTHER LEGAL THEORY, EVEN IF ARM WAS ADVISED OF THE POSSIBILITY - OF SUCH DAMAGES. - - ARM does not seek to limit or exclude liability for death or personal - injury arising from ARM's negligence or ARM's fraud and because some - jurisdictions do not permit the exclusion or limitation of liability - for consequential or incidental damages the above limitation relating - to liability for consequential damages may not apply to you. - - NOTWITHSTANDING ANYTHING TO THE CONTRARY CONTAINED IN THIS LICENCE, - THE MAXIMUM LIABILITY OF ARM TO YOU IN AGGREGATE FOR ALL CLAIMS MADE - AGAINST ARM IN CONTRACT TORT OR OTHERWISE UNDER OR IN CONNECTION WITH - THE SUBJECT MATTER OF THIS LICENCE SHALL NOT EXCEED THE GREATER OF: - (I) THE TOTAL OF SUMS PAID BY YOU TO ARM (IF ANY) FOR THIS LICENCE; - AND (II) $10.00 USD. THE EXISTENCE OF MORE THAN ONE CLAIM WILL NOT - ENLARGE OR EXTEND THE LIMIT. - - 6. CONFIDENTIALITY. - - You acknowledge that the Software and any benchmarking data and - related information mentioned in Clause 2 may contain trade secrets - and confidential material and you agree to maintain all such - information in confidence and apply security measures no less - stringent than the measures which you apply to protect your own like - information, but not less than a reasonable degree of care, to prevent - their unauthorised disclosure and use. Subject to any restrictions - imposed by applicable law, the period of confidentiality shall be - indefinite. You agree not to use any such information other than in - normal use of the Software under the licences granted in this Licence. - - 7. U.S. GOVERNMENT END USERS. - - US Government Restrictions: Use, duplication, reproduction, release, - modification, disclosure or transfer of the Software is restricted in - accordance with the terms of this Licence. - - 8. TERM AND TERMINATION. - - This Licence shall remain in force until terminated by you or by - ARM. Without prejudice to any of its other rights if you are in breach - of any of the terms and conditions of this Licence then ARM may - terminate this Licence immediately upon giving written notice to you - or on thirty (30) days written notice without cause. You may terminate - this Licence at any time. Upon termination of this Licence by you or - by ARM , you shall stop using the Software and confidential - information and destroy all copies of the Software and confidential - information in your possession, together with all documentation and - related materials. The provisions of clauses 4, 5, 6, 7, 8 and 9 shall - survive termination of this Licence. - - 9. GENERAL. - - This Licence is governed by English Law. Except where ARM agrees - otherwise in: (i) a written contract signed by you and ARM; or (ii) a - written contract provided by ARM and accepted by you, this is the only - agreement between you and ARM relating to the Software and it may only - be modified by written agreement between you and ARM. Except as - expressly agreed in writing, this Licence may not be modified by - purchase orders, advertising or other representation by any person. If - any clause or sentence in this Licence is held by a court of law to be - illegal or unenforceable the remaining provisions of this Licence - shall not be affected thereby. The failure by ARM to enforce any of - the provisions of this Licence, unless waived in writing, shall not - constitute a waiver of ARM's rights to enforce such provision or any - other provision of this Licence in the future. - - At ARM's request, you agree to check your computers for installations - of the Software and any other information requested by ARM relating to - Software installation and to provide this information to ARM. You - agree that auditors nominated by ARM may also perform such checking - and reporting on behalf of ARM by prior appointment during your normal - business hours on seven (7) days' notice. ARM shall bear the auditors' - costs for that audit unless it reveals unlicensed usage in which case - you shall promptly reimburse ARM for all reasonable costs and - expenses, including professional fees, relating to such audit. Any - information which is disclosed to ARM or such auditors during checking - or audit shall be treated as your confidential information and shall - only be used by ARM for licence management, compliance and enforcement - purposes. - - The Software provided under this Licence is subject to U.S. export - control laws, including the U.S. Export Administration Act and its - associated regulations, and may be subject to export or import - regulations in other countries. You agree to comply fully with all - laws and regulations of the United States and other countries ("Export - Laws") to assure that the Software, is not (1) exported, directly or - indirectly, in violation of Export Laws, either to any countries that - are subject to U.S.A. export restrictions or to any end user who has - been prohibited from participating in the U.S.A. export transactions - by any federal agency of the U.S.A. government; or (2) intended to be - used for any purpose prohibited by Export Laws, including, without - limitation, nuclear, chemical, or biological weapons proliferation. - -Mali GPU Userspace LES-PRE-20376 diff --git a/self-extractors_hikey960/arm/staging/BoardConfigPartial.mk b/self-extractors_hikey960/arm/staging/BoardConfigPartial.mk deleted file mode 100644 index c0aab8ba..00000000 --- a/self-extractors_hikey960/arm/staging/BoardConfigPartial.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2016 The Android Open Source Project -# -# 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. diff --git a/self-extractors_hikey960/arm/staging/device-partial.mk b/self-extractors_hikey960/arm/staging/device-partial.mk deleted file mode 100644 index 8af8e9c9..00000000 --- a/self-extractors_hikey960/arm/staging/device-partial.mk +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2016 The Android Open Source Project -# -# 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. - -# Linaro blob(s) necessary for Hikey hardware -PRODUCT_COPY_FILES := \ - vendor/linaro/hikey960/arm/proprietary/lib64/libGLES_mali.so:system/lib64/egl/libGLES_mali.so:linaro \ - vendor/linaro/hikey960/arm/proprietary/libGLES_mali.so:system/lib/egl/libGLES_mali.so:linaro \ - vendor/linaro/hikey960/arm/proprietary/lib64/libGLES_mali.so:system/vendor/lib64/hw/vulkan.hikey960.so:linaro \ - vendor/linaro/hikey960/arm/proprietary/libGLES_mali.so:system/vendor/lib/hw/vulkan.hikey960.so:linaro diff --git a/self-extractors_hikey960/extract-lists.txt b/self-extractors_hikey960/extract-lists.txt index ad4df6bd..932ca9b6 100644 --- a/self-extractors_hikey960/extract-lists.txt +++ b/self-extractors_hikey960/extract-lists.txt @@ -1,6 +1,18 @@ - arm) + hisilicon) TO_EXTRACT="\ - SYSTEM/lib/egl/libGLES_mali.so \ - SYSTEM/lib64/egl/libGLES_mali.so \ + SYSTEM/lib/libc_secshared.so \ + SYSTEM/lib/libhiion.so \ + SYSTEM/lib/libhilog.so \ + SYSTEM/lib/libOMX.hisi.vdec.core.so \ + SYSTEM/lib/libOMX.hisi.video.decoder.so \ + SYSTEM/lib/libOMX_Core.so \ + SYSTEM/lib/libstagefrighthw.so \ + SYSTEM/lib64/libc_secshared.so \ + SYSTEM/lib64/libhiion.so \ + SYSTEM/lib64/libhilog.so \ + SYSTEM/lib64/libOMX.hisi.vdec.core.so \ + SYSTEM/lib64/libOMX.hisi.video.decoder.so \ + SYSTEM/lib64/libOMX_Core.so \ + SYSTEM/lib64/libstagefrighthw.so \ " ;; diff --git a/self-extractors_hikey960/hisilicon/COPYRIGHT b/self-extractors_hikey960/hisilicon/COPYRIGHT new file mode 100644 index 00000000..8e57b9d8 --- /dev/null +++ b/self-extractors_hikey960/hisilicon/COPYRIGHT @@ -0,0 +1 @@ +# (C) HiSilicon Limited. diff --git a/self-extractors_hikey960/hisilicon/LICENSE b/self-extractors_hikey960/hisilicon/LICENSE new file mode 100644 index 00000000..4746d431 --- /dev/null +++ b/self-extractors_hikey960/hisilicon/LICENSE @@ -0,0 +1,126 @@ +End User License Agreement for Software related to Hisilicon HiKey960 Board + +THIS END USER LICENSE AGREEMENT (“AGREEMENT”) IS A LEGAL AGREEMENT BETWEEN +YOU (EITHER A SINGLE INDIVIDUAL, OR SINGLE LEGAL ENTITY) AND HISILICON +TECHNOLOGIES CO., LTD. ("HISILICON") FOR THE USE OF THE SOFTWARE ACCOMPANYING +THIS AGREEMENT. HISILICON IS ONLY WILLING TO LICENSE THE SOFTWARE TO YOU ON +CONDITION THAT YOU ACCEPT ALL OF THE TERMS IN THIS AGREEMENT. BY CLICKING “I +AGREE” OR BY INSTALLING OR OTHERWISE USING OR COPYING THE SOFTWARE YOU +INDICATE THAT YOU AGREE TO BE BOUND BY ALL OF THE TERMS OF THIS AGREEMENT. IF +YOU DO NOT AGREE TO THE TERMS OF THIS AGREEMENT, HISILICON IS UNWILLING +TO LICENSE THE SOFTWARE TO YOU AND YOU MAY NOT INSTALL, USE OR COPY THE +SOFTWARE, AND YOU SHALL PROMPTLY DESTROY, DELETE, OR RETURN THE SOFTWARE TO +YOUR SUPPLIER. + +“SOFTWARE” means the software in object code provided under the terms of this Agreement related +to Hisilicon HiKey960 Board. + +1. GRANT OF LICENSE +In consideration of your agreement to abide by the following terms, and subject to the terms and conditions of +this Agreement, HISILICON hereby grants YOU, a non-transferable, non-exclusive, royalty-free, revocable, +worldwide copyright license (without the right to sublicense) to use and copy the SOFTWARE solely for the +purpose of designing or developing applications for use in conjunction with Hisilicon HiKey960 Board. +All rights to the SOFTWARE and all intellectual property rights contained therein shall remain the sole and +exclusive property of HISILICON. The SOFTWARE is licensed not sold. Except as expressly licensed in +Clause 1, in no event shall the license granted in this Clause 1 be construed as granting YOU expressly or by +implication, estoppels or otherwise, licenses to any intellectual property rights, including but not limited to +patent rights, copyrights, trademark or trade secret in the SOFTWARE. +No right is granted to YOU under this Agreement to manufacture, have manufactured, or sell, supply or +distribute any products which have taken into use or which embody any of the SOFTWARE or any of the +intellectual property rights embodied therein. + +2. RESTRICTIONS +This Agreement does not prevent YOU from using the SOFTWARE for internal benchmarking purposes. +However, YOU shall treat any and all benchmarking data relating to the SOFTWARE, and any other results of +your use or testing of the SOFTWARE which are indicative of its performance, efficacy, reliability or quality, +as confidential information and YOU shall not disclose such information to any third party without the express +written permission of HISILICON. + +YOU shall reproduce and not remove or obscure any notice incorporated by HISILICON in the SOFTWARE to +protect HISILICON’s intellectual property rights embodied therein. +YOU shall not decompile, disassemble, or reverse engineer the SOFTWARE. + +3. FEEDBACK +YOU may choose to provide suggestions, comments, feedback, ideas, modifications or know-how (whether in +oral or written form) relating to the use of the SOFTWARE ("Feedback") to HISILICON under the terms of this +Agreement. YOU hereby grants to HISILICON and its affiliates, under all of your and your affiliates’ (as applicable) +intellectual property rights, a perpetual, irrevocable, royalty free, non-exclusive, worldwide license +to (i) use, copy and modify the Feedback; (ii) sell, supply, or otherwise distribute the Feedback; (iii) design, +have designed, manufacture, have manufactured, use, import, sell, and otherwise distribute and dispose of +products that incorporate the Feedback; and (iv) sublicense (together with the rights to further sublicense) the +rights granted in this paragraph to any third party. + +4. NO WARRANTY +YOU AGREE THAT THE SOFTWARE IS PROVIDED BY HISILICON ON AN "AS IS" BASIS. +HISILICON MAKES NO WARRANTY, EXPRESSED OR IMPLIED OR STATUTORY, WITH RESPECT +TO ANY OF THE SOFTWARE, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES +OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE OR +NON-INFRINGEMENT. +YOU EXPRESSLY ASSUME ALL LIABILITIES AND RISKS, FOR USE OR OPERATION OF THE +SOFTWARE, INCLUDING WITHOUT LIMITATION, SOFTWARE APPLICATIONS DESIGNED OR +INTENDED FOR MISSION CRITICAL APPLICATIONS, SUCH AS PACEMAKERS, WEAPONRY, +AIRCRAFT NAVIGATION, FACTORY CONTROL SYSTEMS, ETC. SHOULD THE SOFTWARE +PROVE DEFECTIVE, YOU ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + +5. NO LIABILITY +PLEASE READ THE INSTRUCTIONS COMPLETELY, AND PLEASE NOTE THAT YOU SHOULD USE +THE SOFTWARE AT YOUR OWN RISK. +IN NO EVENT SHALL HISILICON BE LIABLE FOR ANY DIRECT OR INDIRECT, SPECIAL, +INCIDENTAL OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE OF OR INABILITY TO USE +THE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT +(INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHER LEGAL THEORY, EVEN IF HISILICON +HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. EVEN IF THE SOFTWARE HAS +ANY MATERIAL, VERIFIABLE, AND REPRODUCIBLE PROGRAM ERRORS, HISILICON SHALL +HAVE NO LIABILITY TO MODIFY SUCH ERRORS. +NOTWITHSTANDING ANYTHING TO THE CONTRARY CONTAINED IN THIS AGREEMENT, THE +MAXIMUM LIABILITY OF HISILICON TO YOU IN AGGREGATE FOR ALL CLAIMS MADE AGAINST +HISILICON IN CONTRACT TORT OR OTHERWISE UNDER OR IN CONNECTION WITH THE +SUBJECT MATTER OF THIS AGREEMENT SHALL NOT EXCEED THE TOTAL OF SUMS +RECEIVED BY HISILICON FROM YOU FOR THIS AGREEMENT. THE EXISTENCE OF MORE +THAN ONE CLAIM WILL NOT ENLARGE OR EXTEND THE LIMIT. + +6. CONFIDENTIALITY +YOU acknowledge and agree that the SOFTWARE and any benchmarking data and related information +provided under this Agreement contain trade secrets and confidential material of HISILICON and YOU agree +to maintain all such information in confidence and apply security measures no less stringent than the measures +which YOU apply to protect your own like information, but not less than a reasonable degree of care, to prevent +their unauthorized disclosure and use. The period of confidentiality shall be indefinite. YOU agree not to use +any such information other than in normal use of the SOFTWARE under the license granted in this Agreement. + +7. TERM AND TERMINATION +This Agreement shall remain in force until terminated. HISILICON may terminate this Agreement at any time +with or without any cause. Upon termination of this Agreement, YOU shall immediately stop using the +SOFTWARE and confidential information and destroy all copies of the SOFTWARE and confidential +information in your possession, together with all documentation and related materials. The provisions +of clauses 3, 4, 5, 6, 7 and 8 shall survive termination of this Agreement. + +8. GENERAL +Any provision of this Agreement which is prohibited or unenforceable in any jurisdiction shall be ineffective to +the extent of such prohibition or unenforceability without affecting, impairing or invalidating the remaining +provisions hereof. +The failure by HISILICON to enforce any of the provisions of this Agreement, unless waived in writing, +shall not constitute a waiver of HISILICON's rights to enforce such provision or any other provision of +this Agreement in the future. +At HISILICON’s request, YOU agree to check your computers for installations of the SOFTWARE and any +other information requested by HISILICON relating to SOFTWARE installation and to provide this +information to HISILICON. YOU agree that employees or auditors nominated by HISILICON may also +perform such checking and reporting on behalf of HISILICON by prior appointment during your normal +business hours on seven (7) days’ notice. HISILICON shall bear the auditors’ costs for that audit unless it +reveals unlicensed usage in which case YOU shall promptly reimburse HISILICON for all reasonable costs and +expenses, including professional fees, relating to such audit. +The SOFTWARE provided under this Agreement is subject to U.S. export control laws, including the +U.S. Export Administration Act and its associated regulations, and may be subject to export or import +regulations in other countries. YOU agree to comply fully with all laws and regulations of the United +States and other countries ("Export Laws") to assure that the SOFTWARE, is not (1) exported, directly +or indirectly, in violation of Export Laws, either to any countries that are subject to U.S.A. export +restrictions or to any end user who has been prohibited from participating in the U.S.A. export +transactions by any federal agency of the U.S.A. government; or (2) intended to be used for any +purpose prohibited by Export Laws, including, without limitation, nuclear, chemical, or biological +weapons proliferation. +This Agreement shall be governed by and construed in accordance with the laws of People’s Republic of China, +without reference to the principles of conflicts of laws. Any dispute arising out of or relating to this Agreement +shall be submitted to Shenzhen Longgang District People’s court and parties waive all objections to that +jurisdiction and venue. diff --git a/self-extractors_hikey960/hisilicon/staging/BoardConfigPartial.mk b/self-extractors_hikey960/hisilicon/staging/BoardConfigPartial.mk new file mode 100644 index 00000000..c0aab8ba --- /dev/null +++ b/self-extractors_hikey960/hisilicon/staging/BoardConfigPartial.mk @@ -0,0 +1,13 @@ +# Copyright 2016 The Android Open Source Project +# +# 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. diff --git a/self-extractors_hikey960/hisilicon/staging/device-partial.mk b/self-extractors_hikey960/hisilicon/staging/device-partial.mk new file mode 100644 index 00000000..c76663af --- /dev/null +++ b/self-extractors_hikey960/hisilicon/staging/device-partial.mk @@ -0,0 +1,32 @@ +# Copyright 2016 The Android Open Source Project +# +# 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. + +# Blobs needed for HiKey960 video decoding hardware +TARGET_HISI_CODEC_VERSION := 1 + +PRODUCT_COPY_FILES += vendor/linaro/hikey960/hisilicon/proprietary/libOMX.hisi.video.decoder.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOMX.hisi.video.decoder.so \ + vendor/linaro/hikey960/hisilicon/proprietary/lib64/libOMX.hisi.video.decoder.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOMX.hisi.video.decoder.so \ + vendor/linaro/hikey960/hisilicon/proprietary/libOMX.hisi.vdec.core.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOMX.hisi.vdec.core.so \ + vendor/linaro/hikey960/hisilicon/proprietary/lib64/libOMX.hisi.vdec.core.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOMX.hisi.vdec.core.so \ + vendor/linaro/hikey960/hisilicon/proprietary/libOMX_Core.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOMX_Core.so \ + vendor/linaro/hikey960/hisilicon/proprietary/lib64/libOMX_Core.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOMX_Core.so \ + vendor/linaro/hikey960/hisilicon/proprietary/libstagefrighthw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libstagefrighthw.so \ + vendor/linaro/hikey960/hisilicon/proprietary/lib64/libstagefrighthw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libstagefrighthw.so \ + vendor/linaro/hikey960/hisilicon/proprietary/libc_secshared.so:$(TARGET_COPY_OUT_VENDOR)/lib/libc_secshared.so \ + vendor/linaro/hikey960/hisilicon/proprietary/lib64/libc_secshared.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libc_secshared.so \ + vendor/linaro/hikey960/hisilicon/proprietary/lib64/libhilog.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhilog.so \ + vendor/linaro/hikey960/hisilicon/proprietary/libhilog.so:$(TARGET_COPY_OUT_VENDOR)/lib/libhilog.so \ + vendor/linaro/hikey960/hisilicon/proprietary/lib64/libhiion.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhiion.so \ + vendor/linaro/hikey960/hisilicon/proprietary/libhiion.so:$(TARGET_COPY_OUT_VENDOR)/lib/libhiion.so + diff --git a/self-extractors_hikey960/root/device-vendor.mk b/self-extractors_hikey960/root/device-vendor.mk index 0dd71234..31f5c3a3 100644 --- a/self-extractors_hikey960/root/device-vendor.mk +++ b/self-extractors_hikey960/root/device-vendor.mk @@ -16,4 +16,4 @@ LOCAL_STEM := device-partial.mk -$(call inherit-product-if-exists, vendor/linaro/hikey960/arm/$(LOCAL_STEM)) +$(call inherit-product-if-exists, vendor/linaro/hikey960/hisilicon/$(LOCAL_STEM)) -- cgit v1.2.3