StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Convert cc_aconfig_library to bazel." into main am: 62f7302701

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2751020

Change-Id: I226eb08792eefe5750f4343dc0778176e89703d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yu Liu
2023-09-21 18:39:31 +00:00
committed by Automerger Merge Worker
parent 17728c0939 62f7302701
commit b84a5aaec3
6 changed files with 94 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/allowlists/allowlists.go
View File

@@ -934,6 +934,7 @@ var (
"aconfig_values",
"aidl_interface_headers",
"bpf",
"cc_aconfig_library",
"cc_prebuilt_library",
"cc_prebuilt_library_headers",
"cc_prebuilt_library_shared",

2
android/config.go
View File

@@ -200,7 +200,7 @@ func (c Config) ReleaseVersion() string {
// The aconfig value set passed to aconfig, derived from RELEASE_VERSION
func (c Config) ReleaseAconfigValueSets() string {
// This logic to handle both Soong module name and bazel target is temporary in order to
// provide backward compatibility where aosp and vendor/google both have the release
// provide backward compatibility where aosp and internal both have the release
// aconfig value set but can't be updated at the same time to use bazel target
value := strings.Split(c.config.productVariables.ReleaseAconfigValueSets, ":")
value_len := len(value)