Separate hidden API flags needed in sdk snapshots for S and T
Previously, the behavior of the stub_flags and all_flags properties was different between S and T. In S they contained paths for the complete set of stub flags and all the encoded flags. However, in T they contained filtered sets of flags which if used in S would prevent build checks from detecting possible inconsistencies. Also, a new signature_patterns property was added in T that is not supported in S. This change creates separate properties/files for T and reverts the behavior of the properties/files that were added in S back to how they behaved in S. The new properties are called filtered_stub_flags and filtered_flags. The S and T properties are tagged with the appropriate supported_build_releases tag to ensure that they are only output when specifically targeted. Bug: 197842263 Test: m nothing Change-Id: Iec8b9c539796c507245b69c0aed980fde6d8694f
This commit is contained in:
@@ -5058,8 +5058,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",
|
||||
},
|
||||
}
|
||||
|
||||
@@ -5109,8 +5110,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",
|
||||
},
|
||||
}
|
||||
|
||||
@@ -5238,8 +5240,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",
|
||||
},
|
||||
}
|
||||
|
||||
@@ -5324,8 +5327,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",
|
||||
},
|
||||
}
|
||||
|
||||
@@ -5408,8 +5412,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",
|
||||
},
|
||||
}
|
||||
|
||||
@@ -7441,8 +7446,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",
|
||||
},
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user