Snap for 8564071 from c97ec7aa9a32ae9ebce562fd6fe0dc1e3bdef81d to mainline-cellbroadcast-releaseaml_cbr_331910000aml_cbr_331810000aml_cbr_331710020aml_cbr_331610010aml_cbr_331510000aml_cbr_331411000aml_cbr_331310010aml_cbr_331111030aml_cbr_331013010aml_cbr_330911010aml_cbr_330810000android13-mainline-cellbroadcast-release

Change-Id: I072399286730477a592cdaa2ec52e25496acab6d

22 files changed, 579 insertions, 58 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..66e8948
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,47 @@
+//
+// Copyright (C) 2021 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.
+
+// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
+//     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+//     DEPENDING ON IT IN YOUR PROJECT. ***
+package {
+    default_applicable_licenses: ["device_linaro_poplar_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+// See: http://go/android-license-faq
+license {
+    name: "device_linaro_poplar_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "legacy_by_exception_only", // by exception only
+        "legacy_proprietary", // by exception only
+    ],
+    // large-scale-change unable to identify any license_text files
+}
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 77edb26..277b883 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,8 +1,18 @@
+# Primary Arch
+TARGET_ARCH := arm
+TARGET_ARCH_VARIANT := armv7-a-neon
+TARGET_CPU_VARIANT := cortex-a9
+TARGET_CPU_ABI := armeabi-v7a
+TARGET_CPU_ABI2 := armeabi
 
-
+TARGET_USES_64_BIT_BINDER := true
+TARGET_BOARD_PLATFORM := poplar
+TARGET_BOOTLOADER_BOARD_NAME := poplar
 
 BOARD_FLASH_BLOCK_SIZE := 512
 
+BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432
+
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612224
 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
 
@@ -22,22 +32,10 @@ TARGET_NO_KERNEL := false
 TARGET_NO_RECOVERY := true
 TARGET_NO_RADIOIMAGE := true
 
-TARGET_ARCH := arm
-TARGET_ARCH_VARIANT := armv7-a-neon
-TARGET_CPU_VARIANT := cortex-a9
-TARGET_CPU_ABI := armeabi-v7a
-TARGET_CPU_ABI2 := armeabi
-
-
-TARGET_USES_64_BIT_BINDER := true
-TARGET_BOARD_PLATFORM := poplar
-TARGET_BOOTLOADER_BOARD_NAME := poplar 
-
 BOARD_KERNEL_CMDLINE := androidboot.hardware=poplar androidboot.selinux=permissive firmware_class.path=/vendor/firmware mmz=ddr,0,0,60M
 BOARD_KERNEL_CMDLINE += printk.devkmsg=on
 BOARD_KERNEL_CMDLINE += blkdevparts=mmcblk1:4193792@512(loader),40m(boot),1610612224(system),5993660928,268434944@1580m(vendor),268434944@1836m(cache),5364m@2092m(userdata)
 
-
 #sepolicy
 BOARD_SEPOLICY_DIRS := device/linaro/poplar/sepolicy
 
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..c653c6a
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,7 @@
+# *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
+#     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+#     DEPENDING ON IT IN YOUR PROJECT. ***
+third_party {
+  license_note: "would be NOTICE save for the proprietary directory"
+  license_type: BY_EXCEPTION_ONLY
+}
diff --git a/audio/Android.mk b/audio/Android.mk
index 0bf5590..b064ae5 100644
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -14,6 +14,8 @@
 
 LOCAL_PATH := $(call my-dir)
 
+$(eval $(call declare-1p-copy-files,device/linaro/poplar/audio,))
+
 # The default audio HAL module, which is a stub, that is loaded if no other
 # device specific modules are present. The exact load order can be seen in
 # libhardware/hardware.c
@@ -24,6 +26,8 @@ include $(CLEAR_VARS)
 
 LOCAL_HEADER_LIBRARIES += libhardware_headers
 LOCAL_MODULE := audio.primary.poplar
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_VENDOR_MODULE := true
 
@@ -37,4 +41,3 @@ LOCAL_C_INCLUDES += \
         system/media/audio_effects/include
 
 include $(BUILD_SHARED_LIBRARY)
-
diff --git a/bluetooth/Android.mk b/bluetooth/Android.mk
new file mode 100644
index 0000000..fe6f6a9
--- /dev/null
+++ b/bluetooth/Android.mk
@@ -0,0 +1 @@
+$(eval $(call declare-1p-copy-files,device/linaro/poplar/bluetooth,))
diff --git a/device.mk b/device.mk
index f9e5589..9d4ba1b 100644
--- a/device.mk
+++ b/device.mk
@@ -1,3 +1,5 @@
+PRODUCT_SOONG_NAMESPACES += device/linaro/poplar/proprietary
+
 # 1. bootimage
 # 1.1 kernel and dtb
 LOCAL_KERNEL := device/linaro/poplar-kernel/Image
@@ -44,11 +46,10 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml
 ## build packages
 PRODUCT_PACKAGES += \
-    android.hardware.audio@2.0-impl \
-    android.hardware.audio@2.0-service \
-    android.hardware.audio.effect@2.0-impl \
-    android.hardware.soundtrigger@2.0-impl \
-    audio.a2dp.default \
+    android.hardware.audio@4.0-impl \
+    android.hardware.audio@4.0-service \
+    android.hardware.audio.effect@4.0-impl \
+    android.hardware.soundtrigger@4.0-impl \
     audio.usb.default \
     audio.r_submix.default \
     audio.primary.poplar
@@ -83,13 +84,13 @@ PRODUCT_PACKAGES += \
     android.hardware.graphics.composer@2.1-impl \
     android.hardware.graphics.composer@2.1-service
 ## copy packages
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/proprietary/hisilicon/libGLES_mali.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libGLES_mali.so \
-    $(LOCAL_PATH)/proprietary/hisilicon/hwcomposer.poplar.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/hwcomposer.poplar.so \
-    $(LOCAL_PATH)/proprietary/hisilicon/libhi_gfx2d.so:$(TARGET_COPY_OUT_VENDOR)/lib/libhi_gfx2d.so \
-    $(LOCAL_PATH)/proprietary/hisilicon/overlay.poplar.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/overlay.poplar.so \
-    $(LOCAL_PATH)/proprietary/hisilicon/gralloc.poplar.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/gralloc.poplar.so \
-    $(LOCAL_PATH)/proprietary/hisilicon/libion_ext.so:$(TARGET_COPY_OUT_VENDOR)/lib/libion_ext.so
+PRODUCT_PACKAGES += \
+    libGLES_mali \
+    hwcomposer.poplar \
+    libhi_gfx2d \
+    overlay.poplar \
+    gralloc.poplar \
+    libion_ext
 
 # Property required by HiSilicon gralloc
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -105,17 +106,17 @@ PRODUCT_PACKAGES += \
 
 # start HAL media.codec >>>>>>>>
 ## copy packages
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/proprietary/hisilicon/libstagefrighthw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libstagefrighthw.so \
-    $(LOCAL_PATH)/proprietary/hisilicon/libhi_common.so:$(TARGET_COPY_OUT_VENDOR)/lib/libhi_common.so \
-    $(LOCAL_PATH)/proprietary/hisilicon/libhi_msp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libhi_msp.so \
-    $(LOCAL_PATH)/proprietary/hisilicon/libhi_vfmw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libhi_vfmw.so \
-    $(LOCAL_PATH)/proprietary/hisilicon/libOMX_Core.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOMX_Core.so \
-    $(LOCAL_PATH)/proprietary/hisilicon/libOMX.hisi.video.decoder.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOMX.hisi.video.decoder.so \
-    $(LOCAL_PATH)/proprietary/hisilicon/libhiavplayer.so:$(TARGET_COPY_OUT_VENDOR)/lib/libhiavplayer.so \
-    $(LOCAL_PATH)/proprietary/hisilicon/libhiavplayer_adp.so:$(TARGET_COPY_OUT_VENDOR)/lib/libhiavplayer_adp.so \
-    $(LOCAL_PATH)/proprietary/hisilicon/libhiavplayerservice.so:$(TARGET_COPY_OUT_VENDOR)/lib/libhiavplayerservice.so \
-    $(LOCAL_PATH)/proprietary/hisilicon/hiavplayer:$(TARGET_COPY_OUT_VENDOR)/bin/hiavplayer
+PRODUCT_PACKAGES += \
+    libstagefrighthw \
+    libhi_common \
+    libhi_msp \
+    libhi_vfmw \
+    libOMX_Core \
+    libOMX.hisi.video.decoder \
+    libhiavplayer \
+    libhiavplayer_adp \
+    libhiavplayerservice \
+    hiavplayer
 ## service init.rc scripts
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/vendor/hiavplayer.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hiavplayer.rc
@@ -137,8 +138,8 @@ PRODUCT_PACKAGES += \
     android.hardware.bluetooth@1.0-service.rc \
     android.hardware.bluetooth@1.0-impl
 ## copy packages
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/proprietary/bt-wifi/libbt-vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib/libbt-vendor.so
+PRODUCT_PACKAGES += \
+    libbt-vendor
 ## config files
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/bluetooth/rtkbt.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/rtkbt.conf
@@ -175,6 +176,14 @@ PRODUCT_PROPERTY_OVERRIDES += \
     wifi.interface=wlan0 \
     wifi.supplicant_scan_interval=15
 
+# Cuttlefish Health HAL:
+PRODUCT_PACKAGES += \
+    android.hardware.health@2.1-impl-cuttlefish \
+    android.hardware.health@2.1-service
+
+# Software Gatekeeper HAL
+PRODUCT_PACKAGES += \
+    android.hardware.gatekeeper@1.0-service.software
 
 # manifest.xml
 DEVICE_MANIFEST_FILE := $(LOCAL_PATH)/manifest.xml
diff --git a/manifest.xml b/manifest.xml
index 6a94f91..71fc9e3 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,8 +1,8 @@
-<manifest version="1.0" type="device">
+<manifest version="1.0" type="device" target-level="3">
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
-        <version>2.0</version>
+        <version>4.0</version>
         <interface>
             <name>IDevicesFactory</name>
             <instance>default</instance>
@@ -11,7 +11,7 @@
     <hal format="hidl">
         <name>android.hardware.audio.effect</name>
         <transport>hwbinder</transport>
-        <version>2.0</version>
+        <version>4.0</version>
         <interface>
             <name>IEffectsFactory</name>
             <instance>default</instance>
@@ -47,15 +47,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.wifi</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IWifi</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.graphics.composer</name>
         <transport>hwbinder</transport>
         <version>2.1</version>
diff --git a/media/Android.mk b/media/Android.mk
new file mode 100644
index 0000000..0606a2f
--- /dev/null
+++ b/media/Android.mk
@@ -0,0 +1,2 @@
+$(eval $(call declare-1p-copy-files,device/linaro/poplar/media,.rc))
+$(eval $(call declare-1p-copy-files,device/linaro/poplar/media,.xml))
diff --git a/optee/Android.mk b/optee/Android.mk
new file mode 100644
index 0000000..1c08cd5
--- /dev/null
+++ b/optee/Android.mk
@@ -0,0 +1 @@
+$(eval $(call declare-1p-copy-files,device/linaro/poplar/optee,))
diff --git a/proprietary/Android.bp b/proprietary/Android.bp
new file mode 100644
index 0000000..67d6860
--- /dev/null
+++ b/proprietary/Android.bp
@@ -0,0 +1,29 @@
+// Copyright (C) 2020 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.
+
+soong_namespace {
+}
+
+// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
+//     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+//     DEPENDING ON IT IN YOUR PROJECT. ***
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "device_linaro_poplar_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-BSD
+    //   legacy_proprietary (by exception only)
+    default_applicable_licenses: ["device_linaro_poplar_license"],
+}
diff --git a/proprietary/Android.mk b/proprietary/Android.mk
new file mode 100644
index 0000000..59dc0db
--- /dev/null
+++ b/proprietary/Android.mk
@@ -0,0 +1,2 @@
+$(eval $(call declare-copy-files-license-metadata,device/linaro/poplar/proprietary/bt-wifi,,SPDX-license-identifier-BSD,notice,device/linaro/poplar/proprietary/bt-wifi/License.txt,))
+
diff --git a/proprietary/bt-wifi/Android.bp b/proprietary/bt-wifi/Android.bp
new file mode 100644
index 0000000..035c27e
--- /dev/null
+++ b/proprietary/bt-wifi/Android.bp
@@ -0,0 +1,44 @@
+// Copyright (C) 2020 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.
+
+// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
+//     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+//     DEPENDING ON IT IN YOUR PROJECT. ***
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "device_linaro_poplar_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-BSD
+    //   legacy_proprietary (by exception only)
+    default_applicable_licenses: ["device_linaro_poplar_license"],
+}
+
+cc_prebuilt_library_shared {
+    name: "libbt-vendor",
+    srcs: ["libbt-vendor.so"],
+    shared_libs: [
+        "libcutils",
+        "liblog",
+        "libc++",
+        "libc",
+        "libm",
+        "libdl",
+    ],
+    compile_multilib: "32",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
diff --git a/proprietary/hisilicon/Android.bp b/proprietary/hisilicon/Android.bp
new file mode 100644
index 0000000..911b3de
--- /dev/null
+++ b/proprietary/hisilicon/Android.bp
@@ -0,0 +1,384 @@
+// Copyright (C) 2020 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.
+
+// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
+//     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+//     DEPENDING ON IT IN YOUR PROJECT. ***
+package {
+    default_applicable_licenses: [
+        "device_linaro_poplar_proprietary_hisilicon_license",
+    ],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+// See: http://go/android-license-faq
+license {
+    name: "device_linaro_poplar_proprietary_hisilicon_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "legacy_by_exception_only", // by exception only
+        "legacy_proprietary", // by exception only
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
+cc_prebuilt_library_shared {
+    name: "gralloc.poplar",
+    srcs: ["gralloc.poplar.so"],
+    shared_libs: [
+        "libhardware",
+        "liblog",
+        "libcutils",
+        "libGLESv1_CM",
+        "libion",
+        "libion_ext",
+        "libsync",
+        "libutils",
+        "libc++",
+        "libc",
+        "libm",
+        "libdl",
+    ],
+    compile_multilib: "32",
+    relative_install_path: "hw",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+    allow_undefined_symbols: true,
+}
+
+cc_prebuilt_binary {
+    name: "hiavplayer",
+    srcs: ["hiavplayer"],
+    shared_libs: [
+        "libbinder",
+        "libutils",
+        "liblog",
+        "libhiavplayerservice",
+        "libc++",
+        "libc",
+        "libm",
+        "libdl",
+    ],
+    compile_multilib: "32",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "hwcomposer.poplar",
+    srcs: ["hwcomposer.poplar.so"],
+    shared_libs: [
+        "liblog",
+        "libEGL",
+        "libhardware",
+        "libhi_gfx2d",
+        "libhi_msp",
+        "libutils",
+        "libcutils",
+        "libGLESv2",
+        "libui",
+        "android.hardware.graphics.allocator@2.0",
+        "libsync",
+        "libc++",
+        "libc",
+        "libm",
+        "libdl",
+    ],
+    compile_multilib: "32",
+    relative_install_path: "hw",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libGLES_mali",
+    srcs: ["libGLES_mali.so"],
+    shared_libs: [
+        "android.hardware.graphics.common@1.0",
+        "liblog",
+        "libz",
+        "libc++",
+        "libm",
+        "libc",
+        "libdl",
+    ],
+    compile_multilib: "32",
+    relative_install_path: "egl",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libhiavplayer_adp",
+    srcs: ["libhiavplayer_adp.so"],
+    shared_libs: [
+        "libhiavplayer",
+        "libhiavplayerservice",
+        "libbinder",
+        "libutils",
+        "liblog",
+        "libc++",
+        "libc",
+        "libm",
+        "libdl",
+    ],
+    compile_multilib: "32",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libhiavplayerservice",
+    srcs: ["libhiavplayerservice.so"],
+    shared_libs: [
+        "libbinder",
+        "libutils",
+        "liblog",
+        "libhiavplayer",
+        "libc++",
+        "libc",
+        "libm",
+        "libdl",
+    ],
+    compile_multilib: "32",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libhiavplayer",
+    srcs: ["libhiavplayer.so"],
+    shared_libs: [
+        "libbinder",
+        "libutils",
+        "libhi_msp",
+        "libhi_common",
+        "liblog",
+        "libc++",
+        "libc",
+        "libm",
+        "libdl",
+    ],
+    compile_multilib: "32",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libhi_common",
+    srcs: ["libhi_common.so"],
+    shared_libs: [
+        "libcutils",
+        "libutils",
+        "liblog",
+        "libc++",
+        "libc",
+        "libm",
+        "libdl",
+    ],
+    compile_multilib: "32",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libhi_gfx2d",
+    srcs: ["libhi_gfx2d.so"],
+    shared_libs: [
+        "libc++",
+        "libc",
+        "libm",
+        "libdl",
+    ],
+    compile_multilib: "32",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libhi_msp",
+    srcs: ["libhi_msp.so"],
+    shared_libs: [
+        "libhi_common",
+        "libcutils",
+        "libutils",
+        "liblog",
+        "libc++",
+        "libc",
+        "libm",
+        "libdl",
+    ],
+    compile_multilib: "32",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libhi_vfmw",
+    srcs: ["libhi_vfmw.so"],
+    shared_libs: [
+        "libutils",
+        "liblog",
+        "libhi_common",
+        "libhi_msp",
+        "libcutils",
+        "libc++",
+        "libc",
+        "libm",
+        "libdl",
+    ],
+    compile_multilib: "32",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libion_ext",
+    srcs: ["libion_ext.so"],
+    shared_libs: [
+        "liblog",
+        "libion",
+        "libc++",
+        "libc",
+        "libm",
+        "libdl",
+    ],
+    compile_multilib: "32",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libOMX_Core",
+    srcs: ["libOMX_Core.so"],
+    shared_libs: [
+        "liblog",
+        "libc++",
+        "libc",
+        "libm",
+        "libdl",
+    ],
+    compile_multilib: "32",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libOMX.hisi.video.decoder",
+    srcs: ["libOMX.hisi.video.decoder.so"],
+    shared_libs: [
+        "libutils",
+        "liblog",
+        "libhi_common",
+        "libhi_msp",
+        "libcutils",
+        "libhiavplayer_adp",
+        "libc++",
+        "libc",
+        "libm",
+        "libdl",
+    ],
+    compile_multilib: "32",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libstagefrighthw",
+    srcs: ["libstagefrighthw.so"],
+    shared_libs: [
+        "libbinder",
+        "libutils",
+        "libcutils",
+        "libui",
+        "libdl",
+        "liblog",
+        "libc++",
+        "libc",
+        "libm",
+    ],
+    compile_multilib: "32",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "overlay.poplar",
+    srcs: ["overlay.poplar.so"],
+    shared_libs: [
+        "libEGL",
+        "liblog",
+        "libhardware",
+        "libutils",
+        "libcutils",
+        "libsync",
+        "libhidlbase",
+        "libhi_msp",
+        "libui",
+        "libc++",
+        "libc",
+        "libm",
+        "libdl",
+    ],
+    compile_multilib: "32",
+    relative_install_path: "hw",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
diff --git a/sepolicy/hal_graphics_composer_default.te b/sepolicy/hal_graphics_composer_default.te
index 387e0d1..31d5438 100644
--- a/sepolicy/hal_graphics_composer_default.te
+++ b/sepolicy/hal_graphics_composer_default.te
@@ -12,8 +12,6 @@ allow hal_graphics_composer_default hi_vdec_device:chr_file { read write open io
 allow hal_graphics_composer_default hi_pq_device:chr_file { read write open ioctl};
 allow hal_graphics_composer_default hi_disp_device:chr_file { read write open ioctl};
 allow hal_graphics_composer_default hi_sys_device:chr_file { read write open ioctl};
-allow hal_graphics_composer_default system_prop:property_service { set };
-allow hal_graphics_composer_default config_prop:property_service { set };
 allow hal_graphics_composer_default vndbinder_device:chr_file { read write open ioctl };
 #allow hal_graphics_composer_default hal_graphics_allocator_hwservice:hwservice_manager { find };
 allow hal_graphics_composer_default hal_graphics_allocator_default:binder { call };
diff --git a/sepolicy/proc_net.te b/sepolicy/proc_net.te
deleted file mode 100644
index 671a224..0000000
--- a/sepolicy/proc_net.te
+++ /dev/null
@@ -1 +0,0 @@
-allow proc_net proc:filesystem { associate };
diff --git a/sepolicy/property.te b/sepolicy/property.te
index 0d5e944..a0a67e0 100644
--- a/sepolicy/property.te
+++ b/sepolicy/property.te
@@ -1,3 +1,3 @@
-type hisi_prop, property_type;
+vendor_public_prop(hisi_prop)
 
 get_prop(domain, hisi_prop)
diff --git a/sepolicy/system_app.te b/sepolicy/system_app.te
index 28378ca..24fbe74 100644
--- a/sepolicy/system_app.te
+++ b/sepolicy/system_app.te
@@ -1,4 +1,3 @@
-set_prop(system_app, hisi_prop)
 allow system_app mali_device:chr_file { getattr ioctl open read write };
 allow system_app hi_vdec_device:chr_file { getattr read write open ioctl };
 
diff --git a/sepolicy/untrusted_app.te b/sepolicy/untrusted_app.te
index ffb9336..4035dd4 100644
--- a/sepolicy/untrusted_app.te
+++ b/sepolicy/untrusted_app.te
@@ -19,7 +19,6 @@ allow untrusted_app { audio_device
                       tombstone_data_file }:dir { getattr read search };
 
 allow untrusted_app hi_userdata_block_device:blk_file { getattr };
-allow untrusted_app fs_bpf:dir { add_name search write };
 allow untrusted_app block_device:{ dir blk_file } { getattr };
 allow untrusted_app mali_device:chr_file { getattr ioctl open read write };
 allow untrusted_app pstorefs:dir { search };
diff --git a/vendor/Android.mk b/vendor/Android.mk
new file mode 100644
index 0000000..b046a3e
--- /dev/null
+++ b/vendor/Android.mk
@@ -0,0 +1 @@
+$(eval $(call declare-1p-copy-files,device/linaro/poplar/vendor,))
diff --git a/wifi/Android.mk b/wifi/Android.mk
index 6d222eb..1d403ec 100644
--- a/wifi/Android.mk
+++ b/wifi/Android.mk
@@ -1,3 +1,6 @@
+$(eval $(call declare-1p-copy-files,device/linaro/poplar/wifi,.conf))
+$(eval $(call declare-1p-copy-files,device/linaro/poplar/wifi,.rc))
+
 ifeq ($(BOARD_WLAN_DEVICE), rtl)
     include $(call all-subdir-makefiles)
 endif
diff --git a/wifi/wifi_hal/Android.mk b/wifi/wifi_hal/Android.mk
index f56bfc4..a466524 100644
--- a/wifi/wifi_hal/Android.mk
+++ b/wifi/wifi_hal/Android.mk
@@ -46,7 +46,8 @@ LOCAL_SRC_FILES := \
 	wifi_offload.cpp
 
 LOCAL_MODULE := libwifi-hal-rtl
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_PROPRIETARY_MODULE := true
 
 include $(BUILD_STATIC_LIBRARY)
-
diff --git a/wifi/wpa_supplicant_8_lib/Android.mk b/wifi/wpa_supplicant_8_lib/Android.mk
index 0d8a47f..c6393ca 100644
--- a/wifi/wpa_supplicant_8_lib/Android.mk
+++ b/wifi/wpa_supplicant_8_lib/Android.mk
@@ -62,6 +62,9 @@ L_CFLAGS += -Wall -Werror -Wno-unused-parameter -Wno-macro-redefined
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := lib_driver_cmd_rtl
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 LOCAL_SHARED_LIBRARIES := libc libcutils
 LOCAL_CFLAGS := $(L_CFLAGS)
 LOCAL_SRC_FILES := $(WPA_SRC_FILE)