diff options
author | 2023-05-18 18:20:28 +0000 | |
---|---|---|
committer | 2023-05-18 18:20:28 +0000 | |
commit | 33cc80eb1f84d607da1a70b76d8dc0370b51a89a (patch) | |
tree | dbc665bd7ac9254dbd0929c2b054b6644d55d699 /tests/bootstrap_test.sh | |
parent | 0b2cb610104910611a157df99ba36ebe87986032 (diff) |
Revert "Revert "Restrict plugins to an existing allowlist""
This reverts commit b20a12553ef65a6401dfe0f67ab8b882da0f89db.
Reason for revert: Rollforward with fix
soong-ca-certificates-apex was missing from allowlist
Test: verify fixes CI breakages
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dfe4a9e4dd088f42ba5e0a3c4f7777c253d378d3)
Merged-In: I00687bd2962dbdaaf55189ca4aa82183264eb8d7
Change-Id: I00687bd2962dbdaaf55189ca4aa82183264eb8d7
Diffstat (limited to 'tests/bootstrap_test.sh')
-rwxr-xr-x | tests/bootstrap_test.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/bootstrap_test.sh b/tests/bootstrap_test.sh index 59352477c..5fc05f8b1 100755 --- a/tests/bootstrap_test.sh +++ b/tests/bootstrap_test.sh @@ -207,8 +207,8 @@ EOF function test_soong_build_rerun_iff_environment_changes() { setup - mkdir -p cherry - cat > cherry/Android.bp <<'EOF' + mkdir -p build/soong/cherry + cat > build/soong/cherry/Android.bp <<'EOF' bootstrap_go_package { name: "cherry", pkgPath: "android/soong/cherry", @@ -224,7 +224,7 @@ bootstrap_go_package { } EOF - cat > cherry/cherry.go <<'EOF' + cat > build/soong/cherry/cherry.go <<'EOF' package cherry import ( @@ -317,8 +317,8 @@ function test_add_file_to_soong_build() { run_soong local -r mtime1=$(stat -c "%y" out/soong/build.ninja) - mkdir -p a - cat > a/Android.bp <<'EOF' + mkdir -p vendor/foo/picard + cat > vendor/foo/picard/Android.bp <<'EOF' bootstrap_go_package { name: "picard-soong-rules", pkgPath: "android/soong/picard", @@ -334,7 +334,7 @@ bootstrap_go_package { } EOF - cat > a/picard.go <<'EOF' + cat > vendor/foo/picard/picard.go <<'EOF' package picard import ( @@ -390,11 +390,11 @@ EOF function test_glob_during_bootstrapping() { setup - mkdir -p a - cat > a/Android.bp <<'EOF' + mkdir -p build/soong/picard + cat > build/soong/picard/Android.bp <<'EOF' build=["foo*.bp"] EOF - cat > a/fooa.bp <<'EOF' + cat > build/soong/picard/fooa.bp <<'EOF' bootstrap_go_package { name: "picard-soong-rules", pkgPath: "android/soong/picard", @@ -410,7 +410,7 @@ bootstrap_go_package { } EOF - cat > a/picard.go <<'EOF' + cat > build/soong/picard/picard.go <<'EOF' package picard import ( @@ -459,7 +459,7 @@ EOF grep -q "Make it so" out/soong/build.ninja || fail "Original action not present" - cat > a/foob.bp <<'EOF' + cat > build/soong/picard/foob.bp <<'EOF' bootstrap_go_package { name: "worf-soong-rules", pkgPath: "android/soong/worf", @@ -476,7 +476,7 @@ bootstrap_go_package { } EOF - cat > a/worf.go <<'EOF' + cat > build/soong/picard/worf.go <<'EOF' package worf import "android/soong/picard" |