poplar: Cumulative patch from commit 6d860e7

6d860e7 (origin/master, origin/HEAD) poplar: use vendor prebuilt wifi files
2de4ee5 wifi: add capabilities for wpa_supplicant
46ac944 poplar: create an optee folder for OP-TEE files
9411998 poplar: move hiavplayer.rc into vendor folder
e19a218 poplar: rename rootfs to vendor
fdb3113 BoardConfig.mk: add printk.devkmsg=on to BOARD_KERNEL_CMDLINE
da84bb1 init.poplar.rc: setprop service.adb.tcp.port 5555
ad56c8a Revert "WIP: temporarily disable bluetooth"
28e4d5e bt: add ro.boot.btmacaddr property and chmod of rtkbt_dev
363a2e4 wifi: enable wifi HAL support
958edb7 wifi: remove use of rtl8822bu module
fe5024d audio: add include of <unistd.h> to fix usleep warnings
6e36a97 device.mk: add Launcher2 package
4673aee WIP: temporarily disable bluetooth
8b6fdda poplar: remove obsolete self-extractors
b8b039f poplar: switch from add_lunch_combo to COMMON_LUNCH_CHOICES
acd1ef6 poplar: enable full treble support
d6df05c audio: update Android.mk for treble support
d9a9261 audio: include <log/log.h> instead of <cutils/log.h>
1f6821d device.mk: use TARGET_COPY_OUT_VENDOR for feature declarations
9b9a1a7 device.mk: clean up newlines and backslash
29db545 device.mk: build soundtrigger package for audio support
3d4498f device.mk: add ro.config.build.name property
fdb44d6 manifest: update manifest file for treble support
d0cc662 ueventd.poplar.rc: add hi_gfx2d device node back
ccc635e sepolicy: sync up selinux policy with Hisilicon development
2c391e5 sepoilcy: remove 'x' attribute from .te files
44c53b7 fstab.poplar: remove system and vendor mount
6b21fe2 fstab.poplar: use by-name symlinks instead of by-num
1e3bd67 poplar: add bt/wifi files and configurations
93bf7a1 device.mk: move BT section close to Wifi

Bug: 110793466
Test: Manual

Change-Id: If7db092bbed239ea83287fcf294b7d70c53e04b5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

24 files changed, 96 insertions, 0 deletions

diff --git a/proprietary/bt-wifi/License.txt b/proprietary/bt-wifi/License.txt
new file mode 100644
index 0000000..57dff20
--- /dev/null
+++ b/proprietary/bt-wifi/License.txt
@@ -0,0 +1,39 @@
+Copyright (c) 2009, Realtek Semiconductor Corporation 
+All rights reserved.
+
+Redistribution.  Redistribution and use in binary form, without 
+modification, are permitted provided that the following conditions are 
+met:
+
+* Redistributions must reproduce the above copyright notice and the 
+  following disclaimer in the documentation and/or other materials 
+  provided with the distribution. 
+* Neither the name of Realtek Semiconductor Corporation nor the names of its
+  suppliers may be used to endorse or promote products derived from this
+  software without specific prior written permission. 
+* No reverse engineering, decompilation, or disassembly of this software 
+  is permitted.
+
+Limited patent license. Realtek Semiconductor Corporation grants a world-wide, 
+royalty-free, non-exclusive license under patents it now or hereafter 
+owns or controls to make, have made, use, import, offer to sell and 
+sell ("Utilize") this software, but solely to the extent that any 
+such patent is necessary to Utilize the software alone, or in 
+combination with an operating system licensed under an approved Open 
+Source license as listed by the Open Source Initiative at 
+http://opensource.org/licenses.  The patent license shall not apply to 
+any other combinations which include this software.  No hardware per 
+se is licensed hereunder.
+
+DISCLAIMER.  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 OWNER 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.
diff --git a/proprietary/bt-wifi/hostapd b/proprietary/bt-wifi/hostapd
new file mode 100755
index 0000000..96d324a
--- /dev/null
+++ b/proprietary/bt-wifi/hostapd
diff --git a/proprietary/bt-wifi/libbt-vendor.so b/proprietary/bt-wifi/libbt-vendor.so
new file mode 100644
index 0000000..c9807b8
--- /dev/null
+++ b/proprietary/bt-wifi/libbt-vendor.so
diff --git a/proprietary/bt-wifi/libwifi-hal.so b/proprietary/bt-wifi/libwifi-hal.so
new file mode 100644
index 0000000..2cbc54b
--- /dev/null
+++ b/proprietary/bt-wifi/libwifi-hal.so
diff --git a/proprietary/bt-wifi/rtl8822b_config b/proprietary/bt-wifi/rtl8822b_config
new file mode 100644
index 0000000..91d3f44
--- /dev/null
+++ b/proprietary/bt-wifi/rtl8822b_config
diff --git a/proprietary/bt-wifi/rtl8822b_fw b/proprietary/bt-wifi/rtl8822b_fw
new file mode 100644
index 0000000..60b2866
--- /dev/null
+++ b/proprietary/bt-wifi/rtl8822b_fw
diff --git a/proprietary/bt-wifi/wpa_supplicant b/proprietary/bt-wifi/wpa_supplicant
new file mode 100755
index 0000000..eb26aaa
--- /dev/null
+++ b/proprietary/bt-wifi/wpa_supplicant
diff --git a/proprietary/hisilicon/LICENSE b/proprietary/hisilicon/LICENSE
new file mode 100644
index 0000000..4577119
--- /dev/null
+++ b/proprietary/hisilicon/LICENSE
@@ -0,0 +1,57 @@
+End User License Agreement for Software related to Hisilicon Poplar 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 Poplar 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 Poplar 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.
+
+YOU shall not distribute the SOFTWARE under an open source license as listed by the Open Source Initiative (a non-profit corporation whose website is www.opensource.org), or other license which requires the source code or object code of the SOFTWARE to be licensed or otherwise shared with any third party.
+
+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 you 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 the parties waive all objections to that jurisdiction and venue.
+
+---------------------------------------------------------------------
+Copyright (C) 2017 Hisilicon Technologies Co., Ltd. All rights reserved.
diff --git a/proprietary/hisilicon/gralloc.poplar.so b/proprietary/hisilicon/gralloc.poplar.so
new file mode 100644
index 0000000..8ccb542
--- /dev/null
+++ b/proprietary/hisilicon/gralloc.poplar.so
diff --git a/proprietary/hisilicon/hiavplayer b/proprietary/hisilicon/hiavplayer
new file mode 100755
index 0000000..1858142
--- /dev/null
+++ b/proprietary/hisilicon/hiavplayer
diff --git a/proprietary/hisilicon/hwcomposer.poplar.so b/proprietary/hisilicon/hwcomposer.poplar.so
new file mode 100644
index 0000000..184367d
--- /dev/null
+++ b/proprietary/hisilicon/hwcomposer.poplar.so
diff --git a/proprietary/hisilicon/libGLES_mali.so b/proprietary/hisilicon/libGLES_mali.so
new file mode 100644
index 0000000..af6d4f6
--- /dev/null
+++ b/proprietary/hisilicon/libGLES_mali.so
diff --git a/proprietary/hisilicon/libOMX.hisi.video.decoder.so b/proprietary/hisilicon/libOMX.hisi.video.decoder.so
new file mode 100644
index 0000000..a676528
--- /dev/null
+++ b/proprietary/hisilicon/libOMX.hisi.video.decoder.so
diff --git a/proprietary/hisilicon/libOMX_Core.so b/proprietary/hisilicon/libOMX_Core.so
new file mode 100644
index 0000000..0f06305
--- /dev/null
+++ b/proprietary/hisilicon/libOMX_Core.so
diff --git a/proprietary/hisilicon/libhi_common.so b/proprietary/hisilicon/libhi_common.so
new file mode 100644
index 0000000..f17309b
--- /dev/null
+++ b/proprietary/hisilicon/libhi_common.so
diff --git a/proprietary/hisilicon/libhi_gfx2d.so b/proprietary/hisilicon/libhi_gfx2d.so
new file mode 100644
index 0000000..44e92bc
--- /dev/null
+++ b/proprietary/hisilicon/libhi_gfx2d.so
diff --git a/proprietary/hisilicon/libhi_msp.so b/proprietary/hisilicon/libhi_msp.so
new file mode 100644
index 0000000..a48e75d
--- /dev/null
+++ b/proprietary/hisilicon/libhi_msp.so
diff --git a/proprietary/hisilicon/libhi_vfmw.so b/proprietary/hisilicon/libhi_vfmw.so
new file mode 100644
index 0000000..4d88a30
--- /dev/null
+++ b/proprietary/hisilicon/libhi_vfmw.so
diff --git a/proprietary/hisilicon/libhiavplayer.so b/proprietary/hisilicon/libhiavplayer.so
new file mode 100644
index 0000000..f83236e
--- /dev/null
+++ b/proprietary/hisilicon/libhiavplayer.so
diff --git a/proprietary/hisilicon/libhiavplayer_adp.so b/proprietary/hisilicon/libhiavplayer_adp.so
new file mode 100644
index 0000000..c590fa6
--- /dev/null
+++ b/proprietary/hisilicon/libhiavplayer_adp.so
diff --git a/proprietary/hisilicon/libhiavplayerservice.so b/proprietary/hisilicon/libhiavplayerservice.so
new file mode 100644
index 0000000..378b7d5
--- /dev/null
+++ b/proprietary/hisilicon/libhiavplayerservice.so
diff --git a/proprietary/hisilicon/libion_ext.so b/proprietary/hisilicon/libion_ext.so
new file mode 100644
index 0000000..c0149b1
--- /dev/null
+++ b/proprietary/hisilicon/libion_ext.so
diff --git a/proprietary/hisilicon/libstagefrighthw.so b/proprietary/hisilicon/libstagefrighthw.so
new file mode 100644
index 0000000..fd64e6a
--- /dev/null
+++ b/proprietary/hisilicon/libstagefrighthw.so
diff --git a/proprietary/hisilicon/overlay.poplar.so b/proprietary/hisilicon/overlay.poplar.so
new file mode 100644
index 0000000..ed6e6c5
--- /dev/null
+++ b/proprietary/hisilicon/overlay.poplar.so