diff options
author | Yo Chiang <yochiang@google.com> | 2020-04-20 03:31:09 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-20 03:31:09 +0000 |
commit | d2f531708f35b4ae19070dd657dd610b95310472 (patch) | |
tree | 8bf8e5a4ece8c8bada8db4112e10dcdc4e7cc21f | |
parent | c9bdaf71fbeffefd206b0d9d040b8ece799e0801 (diff) | |
parent | fd3e3f2e6024af80e88a57c65c765dd609d9713c (diff) | |
download | hikey-android-11.0.0_r43.tar.gz |
Remove ELF PRODUCT_COPY_FILES am: 0f093620bf am: fd3e3f2e60android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-release
Change-Id: Iebe25ee5b3dd6b24c1d3e04ec4bac956edd7ab34
-rw-r--r-- | self-extractors_hikey960/extract-lists.txt | 28 | ||||
-rw-r--r-- | self-extractors_hikey960/hisilicon/staging/Android.bp.txt | 253 | ||||
-rw-r--r-- | self-extractors_hikey960/hisilicon/staging/device-partial.mk | 23 |
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 |