diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-10 23:45:21 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-10 23:45:21 +0000 |
| commit | 6a881f69a8cb541bff97ef9111bbf977dbf4779b (patch) | |
| tree | eaf91612adb992574f43f6b8601dd0d29111ee9f | |
| parent | 52cb5927e28856b082f2608f2059f85ea6a8f655 (diff) | |
| parent | dc1a0d61bf3482e36554bd3b4cd3eaa36658cbcb (diff) | |
| download | bonito-android10-qpr3-release.tar.gz | |
Merge cherrypicks of [11827366, 11829660, 11829049, 11829662, 11829647, 11829300, 11826697, 11829719, 11829051, 11829663, 11829664, 11829838, 11829052, 11829472, 11829586] into qt-qpr3-releaseandroid-10.0.0_r41android10-qpr3-release
Change-Id: Id79fd28741662e4894dc001afb8020d284846a37
| -rw-r--r-- | device.mk | 5 | ||||
| -rw-r--r-- | seccomp_policy/codec2.vendor.ext.policy | 9 |
2 files changed, 3 insertions, 11 deletions
@@ -461,7 +461,9 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PACKAGES += \ libqcodec2 \ vendor.qti.media.c2@1.0-service \ - media_codecs_c2.xml + media_codecs_c2.xml \ + codec2.vendor.ext.policy \ + codec2.vendor.base.policy PRODUCT_PACKAGES += \ android.hardware.camera.provider@2.4-impl \ @@ -644,7 +646,6 @@ PRODUCT_COPY_FILES += \ # Vendor seccomp policy files for media components: PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/seccomp_policy/codec2.vendor.ext.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/codec2.vendor.ext.policy \ $(LOCAL_PATH)/seccomp_policy/mediacodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/seccomp_policy/codec2.vendor.ext.policy b/seccomp_policy/codec2.vendor.ext.policy deleted file mode 100644 index 07b7bf70..00000000 --- a/seccomp_policy/codec2.vendor.ext.policy +++ /dev/null @@ -1,9 +0,0 @@ -# device specific syscalls -pselect6: 1 -eventfd2: 1 -sendto: 1 -recvfrom: 1 -_llseek: 1 -sysinfo: 1 -getcwd: 1 -getdents64: 1 |