Merge "Separate hidden API flags needed in sdk snapshots for S and T" am: 6b383e9ef2

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1835222

Change-Id: I092500dc977cc482a6c662ae9fcd4e71fea32810
This commit is contained in:
Paul Duffin
2021-10-02 11:34:00 +00:00
committed by Automerger Merge Worker
5 changed files with 92 additions and 55 deletions

View File

@@ -4908,8 +4908,9 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
annotation_flags: "my-bootclasspath-fragment/annotation-flags.csv",
metadata: "my-bootclasspath-fragment/metadata.csv",
index: "my-bootclasspath-fragment/index.csv",
stub_flags: "my-bootclasspath-fragment/stub-flags.csv",
all_flags: "my-bootclasspath-fragment/all-flags.csv",
signature_patterns: "my-bootclasspath-fragment/signature-patterns.csv",
filtered_stub_flags: "my-bootclasspath-fragment/filtered-stub-flags.csv",
filtered_flags: "my-bootclasspath-fragment/filtered-flags.csv",
},
}
@@ -4959,8 +4960,9 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
annotation_flags: "my-bootclasspath-fragment/annotation-flags.csv",
metadata: "my-bootclasspath-fragment/metadata.csv",
index: "my-bootclasspath-fragment/index.csv",
stub_flags: "my-bootclasspath-fragment/stub-flags.csv",
all_flags: "my-bootclasspath-fragment/all-flags.csv",
signature_patterns: "my-bootclasspath-fragment/signature-patterns.csv",
filtered_stub_flags: "my-bootclasspath-fragment/filtered-stub-flags.csv",
filtered_flags: "my-bootclasspath-fragment/filtered-flags.csv",
},
}
@@ -5088,8 +5090,9 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
annotation_flags: "my-bootclasspath-fragment/annotation-flags.csv",
metadata: "my-bootclasspath-fragment/metadata.csv",
index: "my-bootclasspath-fragment/index.csv",
stub_flags: "my-bootclasspath-fragment/stub-flags.csv",
all_flags: "my-bootclasspath-fragment/all-flags.csv",
signature_patterns: "my-bootclasspath-fragment/signature-patterns.csv",
filtered_stub_flags: "my-bootclasspath-fragment/filtered-stub-flags.csv",
filtered_flags: "my-bootclasspath-fragment/filtered-flags.csv",
},
}
@@ -5174,8 +5177,9 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
annotation_flags: "my-bootclasspath-fragment/annotation-flags.csv",
metadata: "my-bootclasspath-fragment/metadata.csv",
index: "my-bootclasspath-fragment/index.csv",
stub_flags: "my-bootclasspath-fragment/stub-flags.csv",
all_flags: "my-bootclasspath-fragment/all-flags.csv",
signature_patterns: "my-bootclasspath-fragment/signature-patterns.csv",
filtered_stub_flags: "my-bootclasspath-fragment/filtered-stub-flags.csv",
filtered_flags: "my-bootclasspath-fragment/filtered-flags.csv",
},
}
@@ -5258,8 +5262,9 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) {
annotation_flags: "my-bootclasspath-fragment/annotation-flags.csv",
metadata: "my-bootclasspath-fragment/metadata.csv",
index: "my-bootclasspath-fragment/index.csv",
stub_flags: "my-bootclasspath-fragment/stub-flags.csv",
all_flags: "my-bootclasspath-fragment/all-flags.csv",
signature_patterns: "my-bootclasspath-fragment/signature-patterns.csv",
filtered_stub_flags: "my-bootclasspath-fragment/filtered-stub-flags.csv",
filtered_flags: "my-bootclasspath-fragment/filtered-flags.csv",
},
}
@@ -7291,8 +7296,9 @@ func TestDexpreoptAccessDexFilesFromPrebuiltApex(t *testing.T) {
annotation_flags: "my-bootclasspath-fragment/annotation-flags.csv",
metadata: "my-bootclasspath-fragment/metadata.csv",
index: "my-bootclasspath-fragment/index.csv",
stub_flags: "my-bootclasspath-fragment/stub-flags.csv",
all_flags: "my-bootclasspath-fragment/all-flags.csv",
signature_patterns: "my-bootclasspath-fragment/signature-patterns.csv",
filtered_stub_flags: "my-bootclasspath-fragment/filtered-stub-flags.csv",
filtered_flags: "my-bootclasspath-fragment/filtered-flags.csv",
},
}