Snap for 6412615 from 0f093620bf86767800575bbd7644fde3c29963b1 to rvc-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-release

Change-Id: Ibe4802eb1222b7067ff59d3f2ae4cb17f2365811

3 files changed, 276 insertions, 28 deletions

diff --git a/self-extractors_hikey960/extract-lists.txt b/self-extractors_hikey960/extract-lists.txt
index 932ca9b6..d08821a6 100644
--- a/self-extractors_hikey960/extract-lists.txt
+++ b/self-extractors_hikey960/extract-lists.txt
@@ -1,18 +1,18 @@
   hisilicon)
     TO_EXTRACT="\
-            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 \
+            VENDOR/lib/libc_secshared.so \
+            VENDOR/lib/libhiion.so \
+            VENDOR/lib/libhilog.so \
+            VENDOR/lib/libOMX.hisi.vdec.core.so \
+            VENDOR/lib/libOMX.hisi.video.decoder.so \
+            VENDOR/lib/libOMX_Core.so \
+            VENDOR/lib/libstagefrighthw.so \
+            VENDOR/lib64/libc_secshared.so \
+            VENDOR/lib64/libhiion.so \
+            VENDOR/lib64/libhilog.so \
+            VENDOR/lib64/libOMX.hisi.vdec.core.so \
+            VENDOR/lib64/libOMX.hisi.video.decoder.so \
+            VENDOR/lib64/libOMX_Core.so \
+            VENDOR/lib64/libstagefrighthw.so \
             "
             ;;
diff --git a/self-extractors_hikey960/hisilicon/staging/Android.bp.txt b/self-extractors_hikey960/hisilicon/staging/Android.bp.txt
new file mode 100644
index 00000000..faac74b8
--- /dev/null
+++ b/self-extractors_hikey960/hisilicon/staging/Android.bp.txt
@@ -0,0 +1,253 @@
+// 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 {
+}
+
+cc_prebuilt_library_shared {
+    name: "libc_secshared",
+    arch: {
+        arm: {
+            srcs: ["libc_secshared.so"],
+            shared_libs: [
+                "libc++",
+                "libdl",
+                "libc",
+                "libm",
+            ],
+        },
+        arm64: {
+            srcs: ["lib64/libc_secshared.so"],
+            shared_libs: [
+                "libc++",
+                "libdl",
+                "libc",
+                "libm",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libhiion",
+    arch: {
+        arm: {
+            srcs: ["libhiion.so"],
+            shared_libs: [
+                "liblog",
+                "libion",
+                "libc_secshared",
+                "libc++",
+                "libdl",
+                "libc",
+                "libm",
+            ],
+        },
+        arm64: {
+            srcs: ["lib64/libhiion.so"],
+            shared_libs: [
+                "liblog",
+                "libion",
+                "libc_secshared",
+                "libc++",
+                "libdl",
+                "libc",
+                "libm",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libhilog",
+    arch: {
+        arm: {
+            srcs: ["libhilog.so"],
+            shared_libs: [
+                "libc_secshared",
+                "libdl",
+                "libc",
+                "libm",
+            ],
+        },
+        arm64: {
+            srcs: ["lib64/libhilog.so"],
+            shared_libs: [
+                "libc_secshared",
+                "libdl",
+                "libc",
+                "libm",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libOMX_Core",
+    arch: {
+        arm: {
+            srcs: ["libOMX_Core.so"],
+            shared_libs: [
+                "liblog",
+                "libdl",
+                "libc_secshared",
+                "libc++",
+                "libc",
+                "libm",
+            ],
+        },
+        arm64: {
+            srcs: ["lib64/libOMX_Core.so"],
+            shared_libs: [
+                "liblog",
+                "libdl",
+                "libc_secshared",
+                "libc++",
+                "libc",
+                "libm",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libOMX.hisi.vdec.core",
+    arch: {
+        arm: {
+            srcs: ["libOMX.hisi.vdec.core.so"],
+            shared_libs: [
+                "libion",
+                "libhiion",
+                "liblog",
+                "libc++",
+                "libdl",
+                "libc",
+                "libm",
+            ],
+        },
+        arm64: {
+            srcs: ["lib64/libOMX.hisi.vdec.core.so"],
+            shared_libs: [
+                "libion",
+                "libhiion",
+                "liblog",
+                "libc++",
+                "libdl",
+                "libc",
+                "libm",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libOMX.hisi.video.decoder",
+    arch: {
+        arm: {
+            srcs: ["libOMX.hisi.video.decoder.so"],
+            shared_libs: [
+                "libdl",
+                "libutils",
+                "liblog",
+                "libion",
+                "libhiion",
+                "libcutils",
+                "libOMX.hisi.vdec.core",
+                "libc++",
+                "libc",
+                "libm",
+            ],
+        },
+        arm64: {
+            srcs: ["lib64/libOMX.hisi.video.decoder.so"],
+            shared_libs: [
+                "libdl",
+                "libutils",
+                "liblog",
+                "libion",
+                "libhiion",
+                "libcutils",
+                "libOMX.hisi.vdec.core",
+                "libc++",
+                "libc",
+                "libm",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
+
+cc_prebuilt_library_shared {
+    name: "libstagefrighthw",
+    arch: {
+        arm: {
+            srcs: ["libstagefrighthw.so"],
+            shared_libs: [
+                "liblog",
+                "libcutils",
+                "libutils",
+                "libdl",
+                "libc++",
+                "libc",
+                "libm",
+            ],
+        },
+        arm64: {
+            srcs: ["lib64/libstagefrighthw.so"],
+            shared_libs: [
+                "liblog",
+                "libcutils",
+                "libutils",
+                "libdl",
+                "libc++",
+                "libc",
+                "libm",
+            ],
+        },
+    },
+    compile_multilib: "both",
+    vendor: true,
+    strip: {
+        none: true,
+    },
+}
diff --git a/self-extractors_hikey960/hisilicon/staging/device-partial.mk b/self-extractors_hikey960/hisilicon/staging/device-partial.mk
index c76663af..0e32a4a6 100644
--- a/self-extractors_hikey960/hisilicon/staging/device-partial.mk
+++ b/self-extractors_hikey960/hisilicon/staging/device-partial.mk
@@ -15,18 +15,13 @@
 # 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
+PRODUCT_SOONG_NAMESPACES += vendor/linaro/hikey960/hisilicon/proprietary
 
+PRODUCT_PACKAGES += \
+    libc_secshared \
+    libhiion \
+    libhilog \
+    libOMX_Core \
+    libOMX.hisi.vdec.core \
+    libOMX.hisi.video.decoder \
+    libstagefrighthw