Set min_sdk_version for the Widevine APEX
also remove `use_vndk_as_stable: true` to remove dependency to VNDK libs. Bug: 251299786 Test: build WV APEX with V and install it on U device Change-Id: Ie7f7f9b699119478d4b33f95ab9e6ba7f459346c
This commit is contained in:
@@ -94,6 +94,7 @@ cc_defaults {
|
|||||||
name: "common_widevine_service-multilib-defaults-aidl",
|
name: "common_widevine_service-multilib-defaults-aidl",
|
||||||
owner: "widevine",
|
owner: "widevine",
|
||||||
proprietary: true,
|
proprietary: true,
|
||||||
|
min_sdk_version: "UpsideDownCake",
|
||||||
relative_install_path: "hw",
|
relative_install_path: "hw",
|
||||||
include_dirs: [
|
include_dirs: [
|
||||||
"vendor/widevine/libwvdrmengine/cdm/core/include/",
|
"vendor/widevine/libwvdrmengine/cdm/core/include/",
|
||||||
@@ -224,6 +225,7 @@ cc_library_static {
|
|||||||
"libcrypto",
|
"libcrypto",
|
||||||
"liblog",
|
"liblog",
|
||||||
],
|
],
|
||||||
|
min_sdk_version: "UpsideDownCake",
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -285,6 +287,7 @@ cc_library {
|
|||||||
owner: "widevine",
|
owner: "widevine",
|
||||||
|
|
||||||
proprietary: true,
|
proprietary: true,
|
||||||
|
min_sdk_version: "UpsideDownCake",
|
||||||
}
|
}
|
||||||
|
|
||||||
phony {
|
phony {
|
||||||
|
|||||||
@@ -41,12 +41,13 @@ widevine_apex_defaults {
|
|||||||
prebuilts: [
|
prebuilts: [
|
||||||
"com.google.android.widevine.xml", // etc/vintf
|
"com.google.android.widevine.xml", // etc/vintf
|
||||||
],
|
],
|
||||||
|
// TODO(b/274041915) remove updatable:false
|
||||||
updatable: false,
|
updatable: false,
|
||||||
// TODO(b/268439003) We need an API to get apex version. Until then
|
// 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
|
// 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.
|
// as vendor_configs_file (which the apex can access), turn off force-label.
|
||||||
use_file_contexts_as_is: true,
|
use_file_contexts_as_is: true,
|
||||||
use_vndk_as_stable: true,
|
min_sdk_version: "UpsideDownCake",
|
||||||
vendor: true,
|
vendor: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -39,4 +39,5 @@ cc_library_static {
|
|||||||
"libbase",
|
"libbase",
|
||||||
],
|
],
|
||||||
vendor: true,
|
vendor: true,
|
||||||
|
min_sdk_version: "UpsideDownCake",
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,5 +80,5 @@ cc_library_static {
|
|||||||
],
|
],
|
||||||
|
|
||||||
proprietary: true,
|
proprietary: true,
|
||||||
|
min_sdk_version: "UpsideDownCake",
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,4 +35,5 @@ cc_library {
|
|||||||
static_libs: ["libcdm_metrics_protos"],
|
static_libs: ["libcdm_metrics_protos"],
|
||||||
whole_static_libs: ["libcdm_metrics_protos"],
|
whole_static_libs: ["libcdm_metrics_protos"],
|
||||||
export_static_lib_headers: ["libcdm_metrics_protos"],
|
export_static_lib_headers: ["libcdm_metrics_protos"],
|
||||||
|
min_sdk_version: "UpsideDownCake",
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,4 +66,6 @@ cc_library {
|
|||||||
export_proto_headers: true,
|
export_proto_headers: true,
|
||||||
type: "full",
|
type: "full",
|
||||||
},
|
},
|
||||||
|
|
||||||
|
min_sdk_version: "UpsideDownCake",
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -75,5 +75,5 @@ cc_library_static {
|
|||||||
proprietary: true,
|
proprietary: true,
|
||||||
|
|
||||||
owner: "widevine",
|
owner: "widevine",
|
||||||
|
min_sdk_version: "UpsideDownCake",
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,4 +64,5 @@ cc_library_static {
|
|||||||
cflags: ["-Wthread-safety"],
|
cflags: ["-Wthread-safety"],
|
||||||
|
|
||||||
proprietary: true,
|
proprietary: true,
|
||||||
|
min_sdk_version: "UpsideDownCake",
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,4 +63,5 @@ cc_library_static {
|
|||||||
],
|
],
|
||||||
|
|
||||||
proprietary: true,
|
proprietary: true,
|
||||||
|
min_sdk_version: "UpsideDownCake",
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ cc_library_static {
|
|||||||
proprietary: true,
|
proprietary: true,
|
||||||
|
|
||||||
owner: "widevine",
|
owner: "widevine",
|
||||||
|
min_sdk_version: "UpsideDownCake",
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------
|
// ----------------------------------------------------------------
|
||||||
|
|||||||
Reference in New Issue
Block a user