Merge changes I70159a49,I1809c0fc am: bfe0342e73

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

Change-Id: I666fb2657f4015e5acc80eaf66285a1fb822775d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-08-06 07:43:17 +00:00
committed by Automerger Merge Worker

View File

@@ -146,6 +146,7 @@ var (
"external/scudo": Bp2BuildDefaultTrueRecursively,
"external/selinux/libselinux": Bp2BuildDefaultTrueRecursively,
"external/selinux/libsepol": Bp2BuildDefaultTrueRecursively,
"external/toybox": Bp2BuildDefaultTrueRecursively,
"external/zlib": Bp2BuildDefaultTrueRecursively,
"external/zopfli": Bp2BuildDefaultTrueRecursively,
"external/zstd": Bp2BuildDefaultTrueRecursively,
@@ -335,6 +336,13 @@ var (
"server_configurable_flags",
"tensorflow_headers",
// fastboot
"bootimg_headers",
"fastboot",
"libfastboot",
"liblp",
"libstorage_literals_headers",
//external/avb
"avbtool",
"libavb",
@@ -485,6 +493,9 @@ var (
// b/215723302; awaiting tz{data,_version} to then rename targets conflicting with srcs
"tzdata",
"tz_version",
// '//bionic/libc:libc_bp2build_cc_library_static' is duplicated in the 'deps' attribute of rule
"toybox-static",
}
Bp2buildCcLibraryStaticOnlyList = []string{}