widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove file_contexts workaround

Browse Source 
Bug: 268439003
Merged-In: I9f621f9f6b9f2c67acb556829b7e0894cfadd1c3
Change-Id: I9f621f9f6b9f2c67acb556829b7e0894cfadd1c3
Test: m
(cherry picked from commit c0979a4c872148ccb04142d1741e160600ee1b6b)
This commit is contained in:
Jooyung Han
2025-01-09 20:45:53 -08:00
parent 39c12039cb
commit 419171a8a6
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/apex/Android.bp
View File

@@ -44,10 +44,7 @@ widevine_apex_defaults {
], ],
// TODO(b/274041915) remove updatable:false // TODO(b/274041915) remove updatable:false
updatable: false, updatable: false,
// TODO(b/268439003) We need an API to get apex version. Until then
// we'll read apex_manifest.pb to get the version. To label apex_manifest.pb
// as vendor_configs_file (which the apex can access), turn off force-label.
use_file_contexts_as_is: true,
min_sdk_version: "34", min_sdk_version: "34",
vendor: true, vendor: true,
} }

6
libwvdrmengine/apex/file_contexts
View File

@@ -1,9 +1,3 @@
(/.*)? u:object_r:vendor_file:s0 (/.*)? u:object_r:vendor_file:s0
/bin/hw/android\.hardware\.drm-service\.widevine u:object_r:hal_drm_widevine_exec:s0 /bin/hw/android\.hardware\.drm-service\.widevine u:object_r:hal_drm_widevine_exec:s0
/etc(/.*)? u:object_r:vendor_configs_file:s0 /etc(/.*)? u:object_r:vendor_configs_file:s0
# TODO(b/268439003) Following two entries are typically handled by the build system.
# We override it so that the Widevine APEX can access it to get the apex version.
# When we have a proper API, we can delete these along with
# use_file_contexts_as_is property in Android.bp
/apex_manifest\.pb u:object_r:vendor_configs_file:s0
/ u:object_r:system_file:s0