diff options
| -rw-r--r-- | build/README.md | 4 | ||||
| -rw-r--r-- | build/art.go | 5 | ||||
| -rw-r--r-- | build/go.work | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/build/README.md b/build/README.md index a94d0fc0c8..3e577bbbd7 100644 --- a/build/README.md +++ b/build/README.md @@ -37,7 +37,7 @@ the module. It is also mutually exclusive with the other ones. ``` banchan com.android.art <arch> - export SOONG_ALLOW_MISSING_DEPENDENCIES=true BUILD_BROKEN_DISABLE_BAZEL=true + export SOONG_ALLOW_MISSING_DEPENDENCIES=true ``` For Google internal builds on the internal master-art branch, specify @@ -45,7 +45,7 @@ the module. It is also mutually exclusive with the other ones. ``` banchan com.google.android.art mainline_modules_<arch> - export SOONG_ALLOW_MISSING_DEPENDENCIES=true BUILD_BROKEN_DISABLE_BAZEL=true + export SOONG_ALLOW_MISSING_DEPENDENCIES=true ``` `<arch>` is the device architecture, one of `arm`, `arm64`, `x86`, or diff --git a/build/art.go b/build/art.go index 0ce15f52a3..34e3c159e3 100644 --- a/build/art.go +++ b/build/art.go @@ -103,7 +103,7 @@ func globalFlags(ctx android.LoadHookContext) ([]string, []string) { "-DART_STACK_OVERFLOW_GAP_x86_64=8192") } - if (ctx.Config().NoBionicPageSizeMacro()) { + if ctx.Config().NoBionicPageSizeMacro() { cflags = append(cflags, "-DART_PAGE_SIZE_AGNOSTIC=1") } @@ -390,8 +390,7 @@ func artBinary() android.Module { } func artTest() android.Module { - // Disable bp2build. - module := cc.NewTest(android.HostAndDeviceSupported, false /* bazelable */).Init() + module := cc.NewTest(android.HostAndDeviceSupported).Init() installCodegenCustomizer(module, binary) diff --git a/build/go.work b/build/go.work index f3a0829a37..f5f427ecf1 100644 --- a/build/go.work +++ b/build/go.work @@ -4,8 +4,6 @@ use ( . ../../external/go-cmp ../../external/golang-protobuf - ../../prebuilts/bazel/common/proto/analysis_v2 - ../../prebuilts/bazel/common/proto/build ../../build/blueprint ../../build/soong ) @@ -15,7 +13,5 @@ replace ( github.com/google/blueprint v0.0.0 => ../../build/blueprint github.com/google/go-cmp v0.0.0 => ../../external/go-cmp google.golang.org/protobuf v0.0.0 => ../../external/golang-protobuf - prebuilts/bazel/common/proto/analysis_v2 v0.0.0 => ../../prebuilts/bazel/common/proto/analysis_v2 - prebuilts/bazel/common/proto/build v0.0.0 => ../../prebuilts/bazel/common/proto/build android/soong v0.0.0 => ../../build/soong ) |