From b6f53c064e66f1f7ded2121f9d592463d02e0bdd Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 14 May 2021 07:52:42 +0100 Subject: Refactor special handling of hidden API encoding for master-art Instead of encoding the hidden API with an empty set of flags when the monolithic flags are not available this simply disables encoding altogether which should have the same behavior at runtime. This change also removes the unused flags field in hiddenAPISingleton which was set but never read. Bug: 179354495 Test: m nothing Change-Id: I32d5825e5271829993dd4e5be4d4ee1b22fa7b22 --- apex/apex_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'apex/apex_test.go') diff --git a/apex/apex_test.go b/apex/apex_test.go index afc395d21..68182a712 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -4542,7 +4542,12 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) { } func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { - preparer := java.FixtureConfigureBootJars("myapex:libfoo", "myapex:libbar") + preparer := android.GroupFixturePreparers( + java.FixtureConfigureBootJars("myapex:libfoo", "myapex:libbar"), + // Make sure that the frameworks/base/Android.bp file exists as otherwise hidden API encoding + // is disabled. + android.FixtureAddTextFile("frameworks/base/Android.bp", ""), + ) checkBootDexJarPath := func(t *testing.T, ctx *android.TestContext, stem string, bootDexJarPath string) { t.Helper() -- cgit v1.2.3-59-g8ed1b