From 54c98f5b4af1b47b922bd76a4dbf0aca50c2a453 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Sat, 15 May 2021 08:54:30 +0100 Subject: Perform hidden API encoding in bootclasspath_fragment Previously, the apex content info was populated with hidden API encoded dex jars retrieved directly from the java module. This change retrieves the unencoded dex jars from the java module, encodes them and then stores the result in the apex content info. 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 Change-Id: Ib1b6eb8b62ac50e03b9e0d07c877ca70bb6f6d25 --- apex/bootclasspath_fragment_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apex/bootclasspath_fragment_test.go') diff --git a/apex/bootclasspath_fragment_test.go b/apex/bootclasspath_fragment_test.go index 9a8c7d0b6..b3f70cdac 100644 --- a/apex/bootclasspath_fragment_test.go +++ b/apex/bootclasspath_fragment_test.go @@ -522,8 +522,8 @@ func TestBootclasspathFragmentContentsNoName(t *testing.T) { android.AssertStringDoesContain(t, name+" apex copy command", copyCommands, expectedCopyCommand) } - checkFragmentExportedDexJar("foo", "out/soong/.intermediates/foo/android_common_apex10000/hiddenapi/foo.jar") - checkFragmentExportedDexJar("bar", "out/soong/.intermediates/bar/android_common_apex10000/hiddenapi/bar.jar") + checkFragmentExportedDexJar("foo", "out/soong/.intermediates/mybootclasspathfragment/android_common_apex10000/hiddenapi-modular/encoded/foo.jar") + checkFragmentExportedDexJar("bar", "out/soong/.intermediates/mybootclasspathfragment/android_common_apex10000/hiddenapi-modular/encoded/bar.jar") } // TODO(b/177892522) - add test for host apex. -- cgit v1.2.3-59-g8ed1b