(PRIVATE) drop widevine blobs
We are building them from source.
Change-Id: I5e18c76e0ad3143ba20e22283b7963b4b1593dce
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/Android.bp b/Android.bp
index 9dbeeb0..cfc1a86 100644
--- a/Android.bp
+++ b/Android.bp
@@ -343,15 +343,6 @@
}
prebuilt_etc_xml {
- name: "manifest_android.hardware.drm@1.4-service.widevine",
- owner: "shift",
- src: "proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.widevine.xml",
- filename_from_src: true,
- sub_dir: "vintf/manifest",
- soc_specific: true,
-}
-
-prebuilt_etc_xml {
name: "vendor.qti.gnss@4.0-service",
owner: "shift",
src: "proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml",
diff --git a/axolotl-vendor.mk b/axolotl-vendor.mk
index b470832..151231e 100644
--- a/axolotl-vendor.mk
+++ b/axolotl-vendor.mk
@@ -69,7 +69,6 @@
vendor/shift/axolotl/proprietary/vendor/bin/fm_qsoc_patches:$(TARGET_COPY_OUT_VENDOR)/bin/fm_qsoc_patches \
vendor/shift/axolotl/proprietary/vendor/bin/hvdcp_opti:$(TARGET_COPY_OUT_VENDOR)/bin/hvdcp_opti \
vendor/shift/axolotl/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.bluetooth@1.0-service-qti \
- vendor/shift/axolotl/proprietary/vendor/bin/hw/android.hardware.drm@1.4-service.widevine:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.drm@1.4-service.widevine \
vendor/shift/axolotl/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gatekeeper@1.0-service-qti \
vendor/shift/axolotl/proprietary/vendor/bin/hw/android.hardware.gnss@2.1-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gnss@2.1-service-qti \
vendor/shift/axolotl/proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.keymaster@4.0-service-qti \
@@ -171,7 +170,6 @@
vendor/shift/axolotl/proprietary/vendor/etc/default-permissions/com.qualcomm.qti.cne.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default-permissions/com.qualcomm.qti.cne.xml \
vendor/shift/axolotl/proprietary/vendor/etc/gpfspath_oem_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gpfspath_oem_config.xml \
vendor/shift/axolotl/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.bluetooth@1.0-service-qti.rc \
- vendor/shift/axolotl/proprietary/vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.4-service.widevine.rc \
vendor/shift/axolotl/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc \
vendor/shift/axolotl/proprietary/vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gnss@2.1-service-qti.rc \
vendor/shift/axolotl/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@4.0-service-qti.rc \
@@ -498,8 +496,6 @@
vendor/shift/axolotl/proprietary/vendor/lib/libvppclient.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvppclient.so \
vendor/shift/axolotl/proprietary/vendor/lib/libvpphvx.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvpphvx.so \
vendor/shift/axolotl/proprietary/vendor/lib/libvpplibrary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libvpplibrary.so \
- vendor/shift/axolotl/proprietary/vendor/lib/libwvhidl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwvhidl.so \
- vendor/shift/axolotl/proprietary/vendor/lib/mediadrm/libwvdrmengine.so:$(TARGET_COPY_OUT_VENDOR)/lib/mediadrm/libwvdrmengine.so \
vendor/shift/axolotl/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_Classic.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/capi_v2_aptX_Classic.so \
vendor/shift/axolotl/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_HD.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/capi_v2_aptX_HD.so \
vendor/shift/axolotl/proprietary/vendor/lib/rfsa/adsp/libVC1Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/libVC1Dec.so \
@@ -889,10 +885,8 @@
vendor/shift/axolotl/proprietary/vendor/lib64/libvpplibrary.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvpplibrary.so \
vendor/shift/axolotl/proprietary/vendor/lib64/libwms.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwms.so \
vendor/shift/axolotl/proprietary/vendor/lib64/libwqe.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwqe.so \
- vendor/shift/axolotl/proprietary/vendor/lib64/libwvhidl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwvhidl.so \
vendor/shift/axolotl/proprietary/vendor/lib64/libxml.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libxml.so \
vendor/shift/axolotl/proprietary/vendor/lib64/libxtadapter.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libxtadapter.so \
- vendor/shift/axolotl/proprietary/vendor/lib64/mediadrm/libwvdrmengine.so:$(TARGET_COPY_OUT_VENDOR)/lib64/mediadrm/libwvdrmengine.so \
vendor/shift/axolotl/proprietary/vendor/lib64/qcrild_librilutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/qcrild_librilutils.so \
vendor/shift/axolotl/proprietary/vendor/lib64/qtibus.so:$(TARGET_COPY_OUT_VENDOR)/lib64/qtibus.so \
vendor/shift/axolotl/proprietary/vendor/lib64/qtimutex.so:$(TARGET_COPY_OUT_VENDOR)/lib64/qtimutex.so \
@@ -1027,5 +1021,4 @@
vendor.qti.hardware.data.iwlan-V1.0-java \
vendor.qti.hardware.data.qmi-V1.0-java \
android.hardware.gnss@2.1-service-qti \
- manifest_android.hardware.drm@1.4-service.widevine \
vendor.qti.gnss@4.0-service
diff --git a/proprietary/vendor/bin/hw/android.hardware.drm@1.4-service.widevine b/proprietary/vendor/bin/hw/android.hardware.drm@1.4-service.widevine
deleted file mode 100755
index ef6b727..0000000
--- a/proprietary/vendor/bin/hw/android.hardware.drm@1.4-service.widevine
+++ /dev/null
Binary files differ
diff --git a/proprietary/vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc b/proprietary/vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc
deleted file mode 100644
index 3d8198a..0000000
--- a/proprietary/vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc
+++ /dev/null
@@ -1,28 +0,0 @@
-on property:init.svc.mediadrm=running
- mkdir /data/vendor/mediadrm 0770 media mediadrm
- start vendor.move_data_sh
-
-service vendor.move_data_sh /system/bin/move_widevine_data.sh
- class late_start
- user media
- group media mediadrm system
- disabled
- oneshot
-
-service vendor.drm-widevine-hal-1-4 /vendor/bin/hw/android.hardware.drm@1.4-service.widevine
- interface android.hardware.drm@1.0::ICryptoFactory widevine
- interface android.hardware.drm@1.0::IDrmFactory widevine
- interface android.hardware.drm@1.1::ICryptoFactory widevine
- interface android.hardware.drm@1.1::IDrmFactory widevine
- interface android.hardware.drm@1.2::ICryptoFactory widevine
- interface android.hardware.drm@1.2::IDrmFactory widevine
- interface android.hardware.drm@1.3::ICryptoFactory widevine
- interface android.hardware.drm@1.3::IDrmFactory widevine
- interface android.hardware.drm@1.4::ICryptoFactory widevine
- interface android.hardware.drm@1.4::IDrmFactory widevine
- interface android.hidl.base@1.0::IBase widevine
- class hal
- user media
- group media mediadrm drmrpc system
- ioprio rt 4
- writepid /dev/cpuset/foreground/tasks
diff --git a/proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.widevine.xml b/proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.widevine.xml
deleted file mode 100644
index 78618dc..0000000
--- a/proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.widevine.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-<manifest version="1.0" type="device">
- <hal format="hidl">
- <name>android.hardware.drm</name>
- <transport>hwbinder</transport>
- <fqname>@1.4::ICryptoFactory/widevine</fqname>
- <fqname>@1.4::IDrmFactory/widevine</fqname>
- </hal>
-</manifest>
diff --git a/proprietary/vendor/lib/libwvhidl.so b/proprietary/vendor/lib/libwvhidl.so
deleted file mode 100755
index 0bb2294..0000000
--- a/proprietary/vendor/lib/libwvhidl.so
+++ /dev/null
Binary files differ
diff --git a/proprietary/vendor/lib/mediadrm/libwvdrmengine.so b/proprietary/vendor/lib/mediadrm/libwvdrmengine.so
deleted file mode 100755
index 14ba779..0000000
--- a/proprietary/vendor/lib/mediadrm/libwvdrmengine.so
+++ /dev/null
Binary files differ
diff --git a/proprietary/vendor/lib64/libwvhidl.so b/proprietary/vendor/lib64/libwvhidl.so
deleted file mode 100755
index 422c617..0000000
--- a/proprietary/vendor/lib64/libwvhidl.so
+++ /dev/null
Binary files differ
diff --git a/proprietary/vendor/lib64/mediadrm/libwvdrmengine.so b/proprietary/vendor/lib64/mediadrm/libwvdrmengine.so
deleted file mode 100755
index f2d548c..0000000
--- a/proprietary/vendor/lib64/mediadrm/libwvdrmengine.so
+++ /dev/null
Binary files differ