[conflict] Enable bazel in mainline build script. am: be577742a1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2497055 Ignore-AOSP-First: merge conflict resolution. Change-Id: I76a568c12b77ac1108b2e8e7ae9a0f2b1766a881 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -128,11 +128,9 @@ function init() {
|
|||||||
|
|
||||||
function build_modules() {
|
function build_modules() {
|
||||||
|
|
||||||
#TODO(b/263406837) remove BUILD_BROKEN_DISABLE_BAZEL, which will enable Bazel builds with --bazel-mode by default
|
|
||||||
build/soong/soong_ui.bash --make-mode "$@" \
|
build/soong/soong_ui.bash --make-mode "$@" \
|
||||||
ALWAYS_EMBED_NOTICES=true \
|
ALWAYS_EMBED_NOTICES=true \
|
||||||
MODULE_BUILD_FROM_SOURCE=true \
|
MODULE_BUILD_FROM_SOURCE=true \
|
||||||
BUILD_BROKEN_DISABLE_BAZEL=true \
|
|
||||||
${extra_build_params} \
|
${extra_build_params} \
|
||||||
"${RUN_ERROR_PRONE:+"RUN_ERROR_PRONE=true"}" \
|
"${RUN_ERROR_PRONE:+"RUN_ERROR_PRONE=true"}" \
|
||||||
apps_only \
|
apps_only \
|
||||||
|
|||||||
Reference in New Issue
Block a user