commit 71e98fa3034ce6993c618a85540824ea2ad9d6a9
author Paul Duffin <paulduffin@google.com> Thu Jul 01 15:27:27 2021 +0000
committer Paul Duffin <paulduffin@google.com> Thu Jul 01 15:27:27 2021 +0000
tree 4e5cbd5df8495e71fb21b6156429523a833f0e2c
parent 2b255d7f6b1e50bc92a12e0b8e757c0eda64b173

Revert "Make bootclasspath_fragments always perform hidden API processing"

This reverts commit 2b255d7f6b1e50bc92a12e0b8e757c0eda64b173.

Reason for revert: build breakage http://b/192554546

Bug: 179354495
Change-Id: Id758af3f59bc83b02d8af4b1b83b3f279a208595

sdk/bootclasspath_fragment_sdk_test.go

diff --git a/sdk/bootclasspath_fragment_sdk_test.go b/sdk/bootclasspath_fragment_sdk_test.go
index 9b7b868..5e4b3fe 100644
--- a/sdk/bootclasspath_fragment_sdk_test.go
+++ b/sdk/bootclasspath_fragment_sdk_test.go
@@ -133,13 +133,6 @@
     apex_available: ["com.android.art"],
     image_name: "art",
     contents: ["mybootlib"],
-    hidden_api: {
-        stub_flags: "hiddenapi/stub-flags.csv",
-        annotation_flags: "hiddenapi/annotation-flags.csv",
-        metadata: "hiddenapi/metadata.csv",
-        index: "hiddenapi/index.csv",
-        all_flags: "hiddenapi/all-flags.csv",
-    },
 }
 
 java_import {
@@ -160,13 +153,6 @@
     apex_available: ["com.android.art"],
     image_name: "art",
     contents: ["mysdk_mybootlib@current"],
-    hidden_api: {
-        stub_flags: "hiddenapi/stub-flags.csv",
-        annotation_flags: "hiddenapi/annotation-flags.csv",
-        metadata: "hiddenapi/metadata.csv",
-        index: "hiddenapi/index.csv",
-        all_flags: "hiddenapi/all-flags.csv",
-    },
 }
 
 java_import {
@@ -185,13 +171,8 @@
 }
 `),
 		checkAllCopyRules(`
-.intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/stub-flags.csv -> hiddenapi/stub-flags.csv
-.intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/annotation-flags.csv -> hiddenapi/annotation-flags.csv
-.intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/metadata.csv -> hiddenapi/metadata.csv
-.intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/index.csv -> hiddenapi/index.csv
-.intermediates/mybootclasspathfragment/android_common/modular-hiddenapi/all-flags.csv -> hiddenapi/all-flags.csv
 .intermediates/mybootlib/android_common/javac/mybootlib.jar -> java/mybootlib.jar
-		`),
+`),
 		snapshotTestPreparer(checkSnapshotWithoutSource, preparerForSnapshot),
 
 		// Check the behavior of the snapshot without the source.