From 4d0b4df833b7f9e2e9de4fa6b4cda6aaa6c46d52 Mon Sep 17 00:00:00 2001 From: Chris Parsons Date: Tue, 18 Oct 2022 20:53:11 -0400 Subject: [PATCH] Add prebuilts/ to microfactory includes This allows go sources under subdirectories of prebuilts/ to be referencable by soong_ui and soong_build. Without this change, microfactory does not correctly include go libraries under prebuilts. Test: Conjunction with aosp/2260126 Change-Id: I4cba6fb04d1e274af759fa92f9ae4b2e3ea18447 --- scripts/microfactory.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/microfactory.bash b/scripts/microfactory.bash index 192b38f23..ce4a0e48a 100644 --- a/scripts/microfactory.bash +++ b/scripts/microfactory.bash @@ -59,7 +59,7 @@ function soong_build_go BUILDDIR=$(getoutdir) \ SRCDIR=${TOP} \ BLUEPRINTDIR=${TOP}/build/blueprint \ - EXTRA_ARGS="-pkg-path android/soong=${TOP}/build/soong -pkg-path rbcrun=${TOP}/build/make/tools/rbcrun -pkg-path google.golang.org/protobuf=${TOP}/external/golang-protobuf -pkg-path go.starlark.net=${TOP}/external/starlark-go" \ + EXTRA_ARGS="-pkg-path android/soong=${TOP}/build/soong -pkg-path prebuilts/bazel/common/proto=${TOP}/prebuilts/bazel/common/proto -pkg-path rbcrun=${TOP}/build/make/tools/rbcrun -pkg-path google.golang.org/protobuf=${TOP}/external/golang-protobuf -pkg-path go.starlark.net=${TOP}/external/starlark-go" \ build_go $@ }