summaryrefslogtreecommitdiff
path: root/apex/apex_singleton.go
diff options
context:
space:
mode:
authorArtur Satayev <satayev@google.com>2021-03-11 16:45:04 +0000
committerArtur Satayev <satayev@google.com>2021-03-17 13:44:16 +0000
commitfdb61edf43dc2c4b66e0651e5c96e28be89ffe14 (patch)
tree7c75d6fa5a52121b8370da228eeece90a6edd67b /apex/apex_singleton.go
parentd7ce8402d8895b7ba9d13092d27037784a43cc0e (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
Diffstat (limited to 'apex/apex_singleton.go')
-rw-r--r--apex/apex_singleton.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/apex/apex_singleton.go b/apex/apex_singleton.go
index ee9fc8115..4890ba45e 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{