From d376f7925abc2e861b7da45f286f1f53951ac72a Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 26 Jan 2021 11:59:35 +0000 Subject: [PATCH] Make com.android.art related tests more realistic Previously, some tests used "com.android.art.something" as the name of the APEX containing the ART boot jars but that is not the valid name for an ART APEX. This change switches that to "com.android.art.debug". Bug: 171061220 Test: m nothing Change-Id: I057edc58ae81cdb14076a2d7d117ca1764aa3e52 --- apex/apex_test.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/apex/apex_test.go b/apex/apex_test.go index efe3e04f2..ae0cbe969 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -5865,7 +5865,7 @@ func testNoUpdatableJarsInBootImage(t *testing.T, errmsg string, transformDexpre srcs: ["a.java"], sdk_version: "current", apex_available: [ - "com.android.art.something", + "com.android.art.debug", ], hostdex: true, } @@ -5893,15 +5893,15 @@ func testNoUpdatableJarsInBootImage(t *testing.T, errmsg string, transformDexpre } apex { - name: "com.android.art.something", - key: "com.android.art.something.key", + name: "com.android.art.debug", + key: "com.android.art.debug.key", java_libs: ["some-art-lib"], updatable: true, min_sdk_version: "current", } apex_key { - name: "com.android.art.something.key", + name: "com.android.art.debug.key", } filegroup { @@ -5934,9 +5934,9 @@ func testDexpreoptWithApexes(t *testing.T, bp, errmsg string, transformDexpreopt "build/make/target/product/security": nil, "apex_manifest.json": nil, "AndroidManifest.xml": nil, - "system/sepolicy/apex/some-updatable-apex-file_contexts": nil, - "system/sepolicy/apex/some-non-updatable-apex-file_contexts": nil, - "system/sepolicy/apex/com.android.art.something-file_contexts": nil, + "system/sepolicy/apex/some-updatable-apex-file_contexts": nil, + "system/sepolicy/apex/some-non-updatable-apex-file_contexts": nil, + "system/sepolicy/apex/com.android.art.debug-file_contexts": nil, "framework/aidl/a.aidl": nil, } cc.GatherRequiredFilesForTest(fs) @@ -6000,15 +6000,15 @@ func TestNoUpdatableJarsInBootImage(t *testing.T) { t.Run("updatable jar from ART apex in the ART boot image => ok", func(t *testing.T) { transform = func(config *dexpreopt.GlobalConfig) { - config.ArtApexJars = android.CreateTestConfiguredJarList([]string{"com.android.art.something:some-art-lib"}) + config.ArtApexJars = android.CreateTestConfiguredJarList([]string{"com.android.art.debug:some-art-lib"}) } testNoUpdatableJarsInBootImage(t, "", transform) }) t.Run("updatable jar from ART apex in the framework boot image => error", func(t *testing.T) { - err = `module "some-art-lib" from updatable apexes \["com.android.art.something"\] is not allowed in the framework boot image` + err = `module "some-art-lib" from updatable apexes \["com.android.art.debug"\] is not allowed in the framework boot image` transform = func(config *dexpreopt.GlobalConfig) { - config.BootJars = android.CreateTestConfiguredJarList([]string{"com.android.art.something:some-art-lib"}) + config.BootJars = android.CreateTestConfiguredJarList([]string{"com.android.art.debug:some-art-lib"}) } testNoUpdatableJarsInBootImage(t, err, transform) })