From 8194d61ae00bee17f9a7f3b42b4db5717005a006 Mon Sep 17 00:00:00 2001 From: Salmax Chang Date: Mon, 4 Oct 2021 05:28:58 +0000 Subject: Revert "Separate hidden API flags needed in sdk snapshots for S and T" This reverts commit ba68c936305eeec354ad62192173a147eb3e6348. Reason for revert: suspect to cause build break in b/201948713 Change-Id: Ide3693ac1f8e24bd2f7c12857361885cb6b787ef --- apex/apex_test.go | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) (limited to 'apex/apex_test.go') diff --git a/apex/apex_test.go b/apex/apex_test.go index 5eb7acfb0..420489e68 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -5058,9 +5058,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", }, } @@ -5110,9 +5109,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", }, } @@ -5240,9 +5238,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", }, } @@ -5327,9 +5324,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", }, } @@ -5412,9 +5408,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", }, } @@ -7446,9 +7441,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", }, } -- cgit v1.2.3-59-g8ed1b