diff options
| -rw-r--r-- | android/bazel.go | 38 | ||||
| -rw-r--r-- | android/bazel_paths.go | 10 |
2 files changed, 34 insertions, 14 deletions
diff --git a/android/bazel.go b/android/bazel.go index 86b4e147a..737533af0 100644 --- a/android/bazel.go +++ b/android/bazel.go @@ -178,24 +178,29 @@ var ( "bionic": Bp2BuildDefaultTrueRecursively, "build/bazel/examples/apex/minimal": Bp2BuildDefaultTrueRecursively, "development/sdk": Bp2BuildDefaultTrueRecursively, - "external/gwp_asan": Bp2BuildDefaultTrueRecursively, + "external/arm-optimized-routines": Bp2BuildDefaultTrueRecursively, "external/brotli": Bp2BuildDefaultTrue, + "external/fmtlib": Bp2BuildDefaultTrueRecursively, + "external/gwp_asan": Bp2BuildDefaultTrueRecursively, + "external/jemalloc_new": Bp2BuildDefaultTrueRecursively, + "external/libcap": Bp2BuildDefaultTrueRecursively, + "external/libcxx": Bp2BuildDefaultTrueRecursively, + "external/libcxxabi": Bp2BuildDefaultTrueRecursively, + "external/lz4/lib": Bp2BuildDefaultTrue, + "external/protobuf": Bp2BuildDefaultTrueRecursively, + "external/python/six": Bp2BuildDefaultTrueRecursively, + "external/scudo": Bp2BuildDefaultTrueRecursively, + "external/zlib": Bp2BuildDefaultTrueRecursively, + "prebuilts/clang/host/linux-x86": Bp2BuildDefaultTrueRecursively, + "system/core/libasyncio": Bp2BuildDefaultTrue, "system/core/libcutils": Bp2BuildDefaultTrueRecursively, "system/core/libprocessgroup": Bp2BuildDefaultTrue, "system/core/property_service/libpropertyinfoparser": Bp2BuildDefaultTrueRecursively, - "system/libbase": Bp2BuildDefaultTrueRecursively, - "system/logging/liblog": Bp2BuildDefaultTrueRecursively, - "system/sepolicy/apex": Bp2BuildDefaultTrueRecursively, - "system/timezone/apex": Bp2BuildDefaultTrueRecursively, - "system/timezone/output_data": Bp2BuildDefaultTrueRecursively, - "external/arm-optimized-routines": Bp2BuildDefaultTrueRecursively, - "external/fmtlib": Bp2BuildDefaultTrueRecursively, - "external/jemalloc_new": Bp2BuildDefaultTrueRecursively, - "external/libcxx": Bp2BuildDefaultTrueRecursively, - "external/libcxxabi": Bp2BuildDefaultTrueRecursively, - "external/libcap": Bp2BuildDefaultTrueRecursively, - "external/scudo": Bp2BuildDefaultTrueRecursively, - "prebuilts/clang/host/linux-x86": Bp2BuildDefaultTrueRecursively, + "system/libbase": Bp2BuildDefaultTrueRecursively, + "system/logging/liblog": Bp2BuildDefaultTrueRecursively, + "system/sepolicy/apex": Bp2BuildDefaultTrueRecursively, + "system/timezone/apex": Bp2BuildDefaultTrueRecursively, + "system/timezone/output_data": Bp2BuildDefaultTrueRecursively, } // Per-module denylist to always opt modules out of both bp2build and mixed builds. @@ -231,6 +236,10 @@ var ( "libfdtrack", // depends on liblzma and libbase + "libprotobuf-python", // contains .proto sources + "libprotobuf-internal-protos", // we don't handle path property for fileegroups + "libprotobuf-internal-python-srcs", // we don't handle path property for fileegroups + "libseccomp_policy", // depends on libbase "gwp_asan_crash_handler", // cc_library, ld.lld: error: undefined symbol: memset @@ -269,6 +278,7 @@ var ( "libseccomp_policy_app_zygote_sources", // http://b/200899432, bazel-built cc_genrule does not work in mixed build when it is a dependency of another soong module. "libseccomp_policy_app_sources", // http://b/200899432, bazel-built cc_genrule does not work in mixed build when it is a dependency of another soong module. "libseccomp_policy_system_sources", // http://b/200899432, bazel-built cc_genrule does not work in mixed build when it is a dependency of another soong module. + } // Used for quicker lookups diff --git a/android/bazel_paths.go b/android/bazel_paths.go index b5746f750..995736999 100644 --- a/android/bazel_paths.go +++ b/android/bazel_paths.go @@ -393,9 +393,19 @@ type BazelOutPath struct { OutputPath } +// ensure BazelOutPath implements Path var _ Path = BazelOutPath{} + +// ensure BazelOutPath implements genPathProvider +var _ genPathProvider = BazelOutPath{} + +// ensure BazelOutPath implements objPathProvider var _ objPathProvider = BazelOutPath{} +func (p BazelOutPath) genPathWithExt(ctx ModuleOutPathContext, subdir, ext string) ModuleGenPath { + return PathForModuleGen(ctx, subdir, pathtools.ReplaceExtension(p.path, ext)) +} + func (p BazelOutPath) objPathWithExt(ctx ModuleOutPathContext, subdir, ext string) ModuleObjPath { return PathForModuleObj(ctx, subdir, pathtools.ReplaceExtension(p.path, ext)) } |