Fix prebuilt apexes
- Add vendor:true
- Use use_soong_config_var to toggle prebuilt/source_build
Bug: 251299786
Test: SOONG_CONFIG_widevine_module_source_build=false m \
com.google.android.widevine
Change-Id: If835b443a825dcab1ec09aaa21001602e9b53d20
This commit is contained in:
@@ -24,62 +24,36 @@ package {
|
||||
default_applicable_licenses: ["vendor_widevine_license"],
|
||||
}
|
||||
|
||||
soong_config_module_type_import {
|
||||
from: "packages/modules/common/Android.bp",
|
||||
module_types: ["module_apex_set"],
|
||||
}
|
||||
|
||||
module_apex_set {
|
||||
apex_set {
|
||||
name: "com.google.android.widevine.nonupdatable",
|
||||
apex_name: "com.google.android.widevine",
|
||||
owner: "google",
|
||||
set: "com.google.android.widevine.nonupdatable.apks",
|
||||
prefer: true,
|
||||
vendor: true,
|
||||
// TODO(b/251299786): the prerelease field should be removed once
|
||||
// new api version is released, e.g. U(34).
|
||||
// This is a mitigation for apex extractor matching target sdk version
|
||||
// with current prerelease version.
|
||||
prerelease: true,
|
||||
soong_config_variables: {
|
||||
module_build_from_source: {
|
||||
prefer: false,
|
||||
},
|
||||
use_source_config_var: {
|
||||
config_namespace: "widevine_module",
|
||||
var_name: "source_build",
|
||||
},
|
||||
}
|
||||
|
||||
module_apex_set {
|
||||
apex_set {
|
||||
name: "com.google.android.widevine.lazy",
|
||||
apex_name: "com.google.android.widevine.lazy",
|
||||
owner: "google",
|
||||
set: "com.google.android.widevine.lazy.apks",
|
||||
prefer: true,
|
||||
vendor: true,
|
||||
// TODO(b/251299786): the prerelease field should be removed once
|
||||
// new api version is released, e.g. U(34).
|
||||
// This is a mitigation for apex extractor matching target sdk version
|
||||
// with current prerelease version.
|
||||
prerelease: true,
|
||||
soong_config_variables: {
|
||||
module_build_from_source: {
|
||||
prefer: false,
|
||||
},
|
||||
use_source_config_var: {
|
||||
config_namespace: "widevine_module",
|
||||
var_name: "source_build",
|
||||
},
|
||||
}
|
||||
|
||||
module_apex_set {
|
||||
name: "com.google.android.widevine",
|
||||
apex_name: "com.google.android.widevine",
|
||||
owner: "google",
|
||||
set: "com.google.android.widevine.apks",
|
||||
prefer: true,
|
||||
// TODO(b/251299786): the prerelease field should be removed once
|
||||
// new api version is released, e.g. U(34).
|
||||
// This is a mitigation for apex extractor matching target sdk version
|
||||
// with current prerelease version.
|
||||
prerelease: true,
|
||||
soong_config_variables: {
|
||||
module_build_from_source: {
|
||||
prefer: false,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user