diff options
| author | Artur Satayev <satayev@google.com> | 2021-03-11 16:45:04 +0000 |
|---|---|---|
| committer | Artur Satayev <satayev@google.com> | 2021-03-16 15:02:55 +0000 |
| commit | 8dfcbe466c9cab92c868f8fcfd67ba2bd2d80f8a (patch) | |
| tree | ebc72692a261baf692c582a6ba358841f602db7e /apex/apex_singleton.go | |
| parent | c605053f974d3cc4008807d6b5fa89399f564a45 (diff) | |
Move allowed_deps.txt to packages/modules/common.
Bug: 179234385
Test: run update-apex-allowed-deps.sh locally
Change-Id: I8e8864468b87342c688d001bc5f6e6f8416863ed
Merged-In: I8e8864468b87342c688d001bc5f6e6f8416863ed
(cherry picked from commit 732d6264210513b971205b5c9f1b2f49b9cafdf3)
Diffstat (limited to 'apex/apex_singleton.go')
| -rw-r--r-- | apex/apex_singleton.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apex/apex_singleton.go b/apex/apex_singleton.go index c1aca957e..f587c90d5 100644 --- a/apex/apex_singleton.go +++ b/apex/apex_singleton.go @@ -58,8 +58,8 @@ var ( echo "ERROR: go/apex-allowed-deps-error"; echo "******************************"; echo "Detected changes to allowed dependencies in updatable modules."; - echo "To fix and update build/soong/apex/allowed_deps.txt, please run:"; - echo "$$ (croot && build/soong/scripts/update-apex-allowed-deps.sh)"; + echo "To fix and update packages/modules/common/build/allowed_deps.txt, please run:"; + echo "$$ (croot && packages/modules/common/build/update-apex-allowed-deps.sh)"; echo "Members of mainline-modularization@google.com will review the changes."; echo -e "******************************\n"; exit 1; @@ -81,7 +81,7 @@ func (s *apexDepsInfoSingleton) GenerateBuildActions(ctx android.SingletonContex } }) - allowedDeps := android.ExistentPathForSource(ctx, "build/soong/apex/allowed_deps.txt").Path() + allowedDeps := android.ExistentPathForSource(ctx, "packages/modules/common/build/allowed_deps.txt").Path() newAllowedDeps := android.PathForOutput(ctx, "apex", "depsinfo", "new-allowed-deps.txt") ctx.Build(pctx, android.BuildParams{ |