diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-05-21 16:58:23 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2021-05-24 18:20:07 +0100 |
| commit | 9e3b906581c7b1e1019ed3d2a2a2bec67d3ef501 (patch) | |
| tree | e26365d179feec77b6fb4fe2e25bd03682b67341 /java/platform_bootclasspath_test.go | |
| parent | b40610ad00c64c2d68647cce1bd27e8627c3e43d (diff) | |
Separate monolithic hidden API processing from hiddenAPIFlagFileInfo
The hiddenAPIFlagFileInfo was being used for both the input and output
of bootclasspath_fragment and platform_bootclasspath and also to pass
information around to various hidden API rule methods. Supporting
multiple different uses in this way made it hard to reason about.
This change creates a separate structure for use by the
platform_bootclasspath. Follow up changes will split out other
functionality into separate types.
Bug: 179354495
Test: m com.android.art com.android.ipsec com.android.os.statsd com.android.conscrypt
- verify that this does not change the contents of the apex files
Merged-In: Ia5c5f65ae5645486c42819c669a8601588217f88
Change-Id: Ia5c5f65ae5645486c42819c669a8601588217f88
(cherry picked from commit 438eb57a2744b9b0bd38a5526e67cacf43c42b31)
Diffstat (limited to 'java/platform_bootclasspath_test.go')
| -rw-r--r-- | java/platform_bootclasspath_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/platform_bootclasspath_test.go b/java/platform_bootclasspath_test.go index efcbc80d0..d332f63df 100644 --- a/java/platform_bootclasspath_test.go +++ b/java/platform_bootclasspath_test.go @@ -245,14 +245,14 @@ func TestPlatformBootclasspath_Fragments(t *testing.T) { ).RunTest(t) pbcp := result.Module("platform-bootclasspath", "android_common") - info := result.ModuleProvider(pbcp, hiddenAPIFlagFileInfoProvider).(hiddenAPIFlagFileInfo) + info := result.ModuleProvider(pbcp, monolithicHiddenAPIInfoProvider).(MonolithicHiddenAPIInfo) for _, category := range hiddenAPIFlagFileCategories { name := category.propertyName message := fmt.Sprintf("category %s", name) filename := strings.ReplaceAll(name, "_", "-") expected := []string{fmt.Sprintf("%s.txt", filename), fmt.Sprintf("bar-%s.txt", filename)} - android.AssertPathsRelativeToTopEquals(t, message, expected, info.categoryToPaths[category]) + android.AssertPathsRelativeToTopEquals(t, message, expected, info.FlagsFilesByCategory[category]) } android.AssertPathsRelativeToTopEquals(t, "stub flags", []string{"out/soong/.intermediates/bar-fragment/android_common/modular-hiddenapi/stub-flags.csv"}, info.StubFlagsPaths) |