diff options
author | Yo Chiang <yochiang@google.com> | 2020-04-18 15:48:24 +0800 |
---|---|---|
committer | Yo Chiang <yochiang@google.com> | 2020-04-18 16:01:44 +0800 |
commit | 0f093620bf86767800575bbd7644fde3c29963b1 (patch) | |
tree | 8bf8e5a4ece8c8bada8db4112e10dcdc4e7cc21f | |
parent | c9bdaf71fbeffefd206b0d9d040b8ece799e0801 (diff) | |
download | hikey-0f093620bf86767800575bbd7644fde3c29963b1.tar.gz |
Remove ELF PRODUCT_COPY_FILESandroid-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devaml_tz2_305400100
We're banning ELF prebuilts in PRODUCT_COPY_FILES. Define prebuilt
modules for vendor prebuilts so we can run check_elf_file.py on them.
Use PRODUCT_PACKAGES to install ELF prebuilts.
Bug: 140560012
Test: run ./generate-packages.sh with BID 6406761
Change-Id: Idf3b250869fee88835160723d6e61f62c3a89fb9
-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 |