diff options
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 30 | 
1 files changed, 12 insertions, 18 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 5d7a1be19..d2633d130 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -4908,9 +4908,8 @@ 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", -				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", +				stub_flags: "my-bootclasspath-fragment/stub-flags.csv", +				all_flags: "my-bootclasspath-fragment/all-flags.csv",  			},  		} @@ -4960,9 +4959,8 @@ 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", -				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", +				stub_flags: "my-bootclasspath-fragment/stub-flags.csv", +				all_flags: "my-bootclasspath-fragment/all-flags.csv",  			},  		} @@ -5090,9 +5088,8 @@ 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", -				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", +				stub_flags: "my-bootclasspath-fragment/stub-flags.csv", +				all_flags: "my-bootclasspath-fragment/all-flags.csv",  			},  		} @@ -5177,9 +5174,8 @@ 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", -				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", +				stub_flags: "my-bootclasspath-fragment/stub-flags.csv", +				all_flags: "my-bootclasspath-fragment/all-flags.csv",  			},  		} @@ -5262,9 +5258,8 @@ 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", -				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", +				stub_flags: "my-bootclasspath-fragment/stub-flags.csv", +				all_flags: "my-bootclasspath-fragment/all-flags.csv",  			},  		} @@ -7296,9 +7291,8 @@ 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", -					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", +					stub_flags: "my-bootclasspath-fragment/stub-flags.csv", +					all_flags: "my-bootclasspath-fragment/all-flags.csv",  				},  			}  |