Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4abf2f45 authored by Jiakai Zhang's avatar Jiakai Zhang Committed by Gerrit Code Review
Browse files

Merge changes from topic "boot-image-b280776428" 

* changes:
  Dexpreopt ART jars and framework jars together.
  Unify installDirOnHost and installDirOnDevice.
  Remove the ability to install boot images by bootclasspath_fragments.
  Prepare tests for dexpreopt changes.
parents f8fbff16 c08c162b

apex/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ bootstrap_go_package { 
        "apex_test.go",

        "bootclasspath_fragment_test.go",

        "classpath_element_test.go",

        "dexpreopt_bootjars_test.go",

        "metadata_test.go",

        "platform_bootclasspath_test.go",

        "systemserver_classpath_fragment_test.go",

apex/apex.go

+1 −17
Original line number Diff line number Diff line
@@ -2287,16 +2287,13 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, 
				ctx.PropertyErrorf("sh_binaries", "%q is not a sh_binary module", depName)

			}

		case bcpfTag:

			bcpfModule, ok := child.(*java.BootclasspathFragmentModule)

			_, ok := child.(*java.BootclasspathFragmentModule)

			if !ok {

				ctx.PropertyErrorf("bootclasspath_fragments", "%q is not a bootclasspath_fragment module", depName)

				return false

			}



			vctx.filesInfo = append(vctx.filesInfo, apexBootclasspathFragmentFiles(ctx, child)...)

			for _, makeModuleName := range bcpfModule.BootImageDeviceInstallMakeModules() {

				a.makeModulesToInstall = append(a.makeModulesToInstall, makeModuleName)

			}

			return true

		case sscpfTag:

			if _, ok := child.(*java.SystemServerClasspathModule); !ok {
@@ -2662,19 +2659,6 @@ func apexBootclasspathFragmentFiles(ctx android.ModuleContext, module blueprint. 
	bootclasspathFragmentInfo := ctx.OtherModuleProvider(module, java.BootclasspathFragmentApexContentInfoProvider).(java.BootclasspathFragmentApexContentInfo)

	var filesToAdd []apexFile



	// Add the boot image files, e.g. .art, .oat and .vdex files.

	if bootclasspathFragmentInfo.ShouldInstallBootImageInApex() {

		for arch, files := range bootclasspathFragmentInfo.AndroidBootImageFilesByArchType() {

			dirInApex := filepath.Join("javalib", arch.String())

			for _, f := range files {

				androidMkModuleName := "javalib_" + arch.String() + "_" + filepath.Base(f.String())

				// TODO(b/177892522) - consider passing in the bootclasspath fragment module here instead of nil

				af := newApexFile(ctx, f, androidMkModuleName, dirInApex, etc, nil)

				filesToAdd = append(filesToAdd, af)

			}

		}

	}



	// Add classpaths.proto config.

	if af := apexClasspathFragmentProtoFile(ctx, module); af != nil {

		filesToAdd = append(filesToAdd, *af)

apex/apex_test.go

+8 −8
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ var prepareForApexTest = android.GroupFixturePreparers( 
	android.PrepareForTestWithAndroidBuildComponents,

	bpf.PrepareForTestWithBpf,

	cc.PrepareForTestWithCcBuildComponents,

	java.PrepareForTestWithJavaDefaultModules,

	java.PrepareForTestWithDexpreopt,

	prebuilt_etc.PrepareForTestWithPrebuiltEtc,

	rust.PrepareForTestWithRustDefaultModules,

	sh.PrepareForTestWithShBuildComponents,
@@ -8349,8 +8349,8 @@ func TestNoUpdatableJarsInBootImage(t *testing.T) { 
		testNoUpdatableJarsInBootImage(t, "", preparer, fragments...)

	})



	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.debug"\] is not allowed in the framework boot image`

	t.Run("updatable jar from ART apex in the platform bootclasspath => error", func(t *testing.T) {

		err := `module "some-art-lib" from updatable apexes \["com.android.art.debug"\] is not allowed in the platform bootclasspath`

		// Update the dexpreopt BootJars directly.

		preparer := android.GroupFixturePreparers(

			prepareSetBootJars("com.android.art.debug:some-art-lib"),
@@ -8373,8 +8373,8 @@ func TestNoUpdatableJarsInBootImage(t *testing.T) { 
		testNoUpdatableJarsInBootImage(t, err, preparer)

	})



	t.Run("updatable jar from some other apex in the framework boot image => error", func(t *testing.T) {

		err := `module "some-updatable-apex-lib" from updatable apexes \["some-updatable-apex"\] is not allowed in the framework boot image`

	t.Run("updatable jar from some other apex in the platform bootclasspath => error", func(t *testing.T) {

		err := `module "some-updatable-apex-lib" from updatable apexes \["some-updatable-apex"\] is not allowed in the platform bootclasspath`

		preparer := android.GroupFixturePreparers(

			java.FixtureConfigureBootJars("some-updatable-apex:some-updatable-apex-lib"),

			java.FixtureConfigureApexBootJars("some-non-updatable-apex:some-non-updatable-apex-lib"),
@@ -8382,7 +8382,7 @@ func TestNoUpdatableJarsInBootImage(t *testing.T) { 
		testNoUpdatableJarsInBootImage(t, err, preparer)

	})



	t.Run("non-updatable jar from some other apex in the framework boot image => ok", func(t *testing.T) {

	t.Run("non-updatable jar from some other apex in the platform bootclasspath => ok", func(t *testing.T) {

		preparer := java.FixtureConfigureApexBootJars("some-non-updatable-apex:some-non-updatable-apex-lib")

		fragment := java.ApexVariantReference{

			Apex:   proptools.StringPtr("some-non-updatable-apex"),
@@ -8397,7 +8397,7 @@ func TestNoUpdatableJarsInBootImage(t *testing.T) { 
		testNoUpdatableJarsInBootImage(t, err, preparer)

	})



	t.Run("nonexistent jar in the framework boot image => error", func(t *testing.T) {

	t.Run("nonexistent jar in the platform bootclasspath => error", func(t *testing.T) {

		err := `"platform-bootclasspath" depends on undefined module "nonexistent"`

		preparer := java.FixtureConfigureBootJars("platform:nonexistent")

		testNoUpdatableJarsInBootImage(t, err, preparer)
@@ -8410,7 +8410,7 @@ func TestNoUpdatableJarsInBootImage(t *testing.T) { 
		testNoUpdatableJarsInBootImage(t, err, preparer)

	})



	t.Run("platform jar in the framework boot image => ok", func(t *testing.T) {

	t.Run("platform jar in the platform bootclasspath => ok", func(t *testing.T) {

		preparer := android.GroupFixturePreparers(

			java.FixtureConfigureBootJars("platform:some-platform-lib"),

			java.FixtureConfigureApexBootJars("some-non-updatable-apex:some-non-updatable-apex-lib"),

apex/bootclasspath_fragment_test.go

+3 −160
Original line number Diff line number Diff line
@@ -115,20 +115,7 @@ func TestBootclasspathFragments(t *testing.T) { 


	// Make sure that the art-bootclasspath-fragment is using the correct configuration.

	checkBootclasspathFragment(t, result, "art-bootclasspath-fragment", "android_common_apex10000",

		"com.android.art:baz,com.android.art:quuz", `

dexpreopt_arm64/dex_artjars/android/apex/art_boot_images/javalib/arm/boot.art

dexpreopt_arm64/dex_artjars/android/apex/art_boot_images/javalib/arm/boot.oat

dexpreopt_arm64/dex_artjars/android/apex/art_boot_images/javalib/arm/boot.vdex

dexpreopt_arm64/dex_artjars/android/apex/art_boot_images/javalib/arm/boot-quuz.art

dexpreopt_arm64/dex_artjars/android/apex/art_boot_images/javalib/arm/boot-quuz.oat

dexpreopt_arm64/dex_artjars/android/apex/art_boot_images/javalib/arm/boot-quuz.vdex

dexpreopt_arm64/dex_artjars/android/apex/art_boot_images/javalib/arm64/boot.art

dexpreopt_arm64/dex_artjars/android/apex/art_boot_images/javalib/arm64/boot.oat

dexpreopt_arm64/dex_artjars/android/apex/art_boot_images/javalib/arm64/boot.vdex

dexpreopt_arm64/dex_artjars/android/apex/art_boot_images/javalib/arm64/boot-quuz.art

dexpreopt_arm64/dex_artjars/android/apex/art_boot_images/javalib/arm64/boot-quuz.oat

dexpreopt_arm64/dex_artjars/android/apex/art_boot_images/javalib/arm64/boot-quuz.vdex

`)

		"com.android.art:baz,com.android.art:quuz")

}



func TestBootclasspathFragments_FragmentDependency(t *testing.T) {
@@ -261,7 +248,7 @@ func TestBootclasspathFragments_FragmentDependency(t *testing.T) { 
	checkAPIScopeStubs("other", otherInfo, java.CorePlatformHiddenAPIScope)

}



func checkBootclasspathFragment(t *testing.T, result *android.TestResult, moduleName, variantName string, expectedConfiguredModules string, expectedBootclasspathFragmentFiles string) {

func checkBootclasspathFragment(t *testing.T, result *android.TestResult, moduleName, variantName string, expectedConfiguredModules string) {

	t.Helper()



	bootclasspathFragment := result.ModuleForTests(moduleName, variantName).Module().(*java.BootclasspathFragmentModule)
@@ -269,19 +256,6 @@ func checkBootclasspathFragment(t *testing.T, result *android.TestResult, module 
	bootclasspathFragmentInfo := result.ModuleProvider(bootclasspathFragment, java.BootclasspathFragmentApexContentInfoProvider).(java.BootclasspathFragmentApexContentInfo)

	modules := bootclasspathFragmentInfo.Modules()

	android.AssertStringEquals(t, "invalid modules for "+moduleName, expectedConfiguredModules, modules.String())



	// Get a list of all the paths in the boot image sorted by arch type.

	allPaths := []string{}

	bootImageFilesByArchType := bootclasspathFragmentInfo.AndroidBootImageFilesByArchType()

	for _, archType := range android.ArchTypeList() {

		if paths, ok := bootImageFilesByArchType[archType]; ok {

			for _, path := range paths {

				allPaths = append(allPaths, android.NormalizePathForTesting(path))

			}

		}

	}



	android.AssertTrimmedStringEquals(t, "invalid paths for "+moduleName, expectedBootclasspathFragmentFiles, strings.Join(allPaths, "\n"))

}



func TestBootclasspathFragmentInArtApex(t *testing.T) {
@@ -420,18 +394,6 @@ func TestBootclasspathFragmentInArtApex(t *testing.T) { 
		ensureExactContents(t, result.TestContext, "com.android.art", "android_common_com.android.art_image", []string{

			"etc/boot-image.prof",

			"etc/classpaths/bootclasspath.pb",

			"javalib/arm/boot.art",

			"javalib/arm/boot.oat",

			"javalib/arm/boot.vdex",

			"javalib/arm/boot-bar.art",

			"javalib/arm/boot-bar.oat",

			"javalib/arm/boot-bar.vdex",

			"javalib/arm64/boot.art",

			"javalib/arm64/boot.oat",

			"javalib/arm64/boot.vdex",

			"javalib/arm64/boot-bar.art",

			"javalib/arm64/boot-bar.oat",

			"javalib/arm64/boot-bar.vdex",

			"javalib/bar.jar",

			"javalib/foo.jar",

		})
@@ -441,62 +403,12 @@ func TestBootclasspathFragmentInArtApex(t *testing.T) { 
			`mybootclasspathfragment`,

		})



		// The boot images are installed in the APEX by Soong, so there shouldn't be any dexpreopt-related Make modules.

		ensureDoesNotContainRequiredDeps(t, result.TestContext, "com.android.art", "android_common_com.android.art_image", []string{

			"mybootclasspathfragment-dexpreopt-arm64-boot.art",

			"mybootclasspathfragment-dexpreopt-arm64-boot.oat",

			"mybootclasspathfragment-dexpreopt-arm64-boot.vdex",

			"mybootclasspathfragment-dexpreopt-arm64-boot-bar.art",

			"mybootclasspathfragment-dexpreopt-arm64-boot-bar.oat",

			"mybootclasspathfragment-dexpreopt-arm64-boot-bar.vdex",

			"mybootclasspathfragment-dexpreopt-arm-boot.art",

			"mybootclasspathfragment-dexpreopt-arm-boot.oat",

			"mybootclasspathfragment-dexpreopt-arm-boot.vdex",

			"mybootclasspathfragment-dexpreopt-arm-boot-bar.art",

			"mybootclasspathfragment-dexpreopt-arm-boot-bar.oat",

			"mybootclasspathfragment-dexpreopt-arm-boot-bar.vdex",

		})



		// Make sure that the source bootclasspath_fragment copies its dex files to the predefined

		// locations for the art image.

		module := result.ModuleForTests("mybootclasspathfragment", "android_common_apex10000")

		checkCopiesToPredefinedLocationForArt(t, result.Config, module, "bar", "foo")

	})



	t.Run("boot image files from source no boot image in apex", func(t *testing.T) {

		result := android.GroupFixturePreparers(

			commonPreparer,



			// Configure some libraries in the art bootclasspath_fragment that match the source

			// bootclasspath_fragment's contents property.

			java.FixtureConfigureBootJars("com.android.art:foo", "com.android.art:bar"),

			addSource("foo", "bar"),

			java.FixtureSetBootImageInstallDirOnDevice("art", "system/framework"),

		).RunTest(t)



		ensureExactContents(t, result.TestContext, "com.android.art", "android_common_com.android.art_image", []string{

			"etc/boot-image.prof",

			"etc/classpaths/bootclasspath.pb",

			"javalib/bar.jar",

			"javalib/foo.jar",

		})



		ensureContainsRequiredDeps(t, result.TestContext, "com.android.art", "android_common_com.android.art_image", []string{

			"mybootclasspathfragment-dexpreopt-arm64-boot.art",

			"mybootclasspathfragment-dexpreopt-arm64-boot.oat",

			"mybootclasspathfragment-dexpreopt-arm64-boot.vdex",

			"mybootclasspathfragment-dexpreopt-arm64-boot-bar.art",

			"mybootclasspathfragment-dexpreopt-arm64-boot-bar.oat",

			"mybootclasspathfragment-dexpreopt-arm64-boot-bar.vdex",

			"mybootclasspathfragment-dexpreopt-arm-boot.art",

			"mybootclasspathfragment-dexpreopt-arm-boot.oat",

			"mybootclasspathfragment-dexpreopt-arm-boot.vdex",

			"mybootclasspathfragment-dexpreopt-arm-boot-bar.art",

			"mybootclasspathfragment-dexpreopt-arm-boot-bar.oat",

			"mybootclasspathfragment-dexpreopt-arm-boot-bar.vdex",

		})

	})



	t.Run("generate boot image profile even if dexpreopt is disabled", func(t *testing.T) {

		result := android.GroupFixturePreparers(

			commonPreparer,
@@ -552,18 +464,6 @@ func TestBootclasspathFragmentInArtApex(t *testing.T) { 


		ensureExactDeapexedContents(t, result.TestContext, "com.android.art", "android_common", []string{

			"etc/boot-image.prof",

			"javalib/arm/boot.art",

			"javalib/arm/boot.oat",

			"javalib/arm/boot.vdex",

			"javalib/arm/boot-bar.art",

			"javalib/arm/boot-bar.oat",

			"javalib/arm/boot-bar.vdex",

			"javalib/arm64/boot.art",

			"javalib/arm64/boot.oat",

			"javalib/arm64/boot.vdex",

			"javalib/arm64/boot-bar.art",

			"javalib/arm64/boot-bar.oat",

			"javalib/arm64/boot-bar.vdex",

			"javalib/bar.jar",

			"javalib/foo.jar",

		})
@@ -574,65 +474,12 @@ func TestBootclasspathFragmentInArtApex(t *testing.T) { 
			`prebuilt_com.android.art`,

		})



		// The boot images are installed in the APEX by Soong, so there shouldn't be any dexpreopt-related Make modules.

		ensureDoesNotContainRequiredDeps(t, result.TestContext, "com.android.art", "android_common_com.android.art_image", []string{

			"mybootclasspathfragment-dexpreopt-arm64-boot.art",

			"mybootclasspathfragment-dexpreopt-arm64-boot.oat",

			"mybootclasspathfragment-dexpreopt-arm64-boot.vdex",

			"mybootclasspathfragment-dexpreopt-arm64-boot-bar.art",

			"mybootclasspathfragment-dexpreopt-arm64-boot-bar.oat",

			"mybootclasspathfragment-dexpreopt-arm64-boot-bar.vdex",

			"mybootclasspathfragment-dexpreopt-arm-boot.art",

			"mybootclasspathfragment-dexpreopt-arm-boot.oat",

			"mybootclasspathfragment-dexpreopt-arm-boot.vdex",

			"mybootclasspathfragment-dexpreopt-arm-boot-bar.art",

			"mybootclasspathfragment-dexpreopt-arm-boot-bar.oat",

			"mybootclasspathfragment-dexpreopt-arm-boot-bar.vdex",

		})



		// Make sure that the prebuilt bootclasspath_fragment copies its dex files to the predefined

		// locations for the art image.

		module := result.ModuleForTests("prebuilt_mybootclasspathfragment", "android_common_com.android.art")

		checkCopiesToPredefinedLocationForArt(t, result.Config, module, "bar", "foo")

	})



	t.Run("boot image files from preferred prebuilt no boot image in apex", func(t *testing.T) {

		result := android.GroupFixturePreparers(

			commonPreparer,



			// Configure some libraries in the art bootclasspath_fragment that match the source

			// bootclasspath_fragment's contents property.

			java.FixtureConfigureBootJars("com.android.art:foo", "com.android.art:bar"),

			addSource("foo", "bar"),



			// Make sure that a preferred prebuilt with consistent contents doesn't affect the apex.

			addPrebuilt(true, "foo", "bar"),



			java.FixtureSetBootImageInstallDirOnDevice("art", "system/framework"),

		).RunTest(t)



		ensureExactDeapexedContents(t, result.TestContext, "com.android.art", "android_common", []string{

			"etc/boot-image.prof",

			"javalib/bar.jar",

			"javalib/foo.jar",

		})



		ensureContainsRequiredDeps(t, result.TestContext, "com.android.art", "android_common_com.android.art_image", []string{

			"mybootclasspathfragment-dexpreopt-arm64-boot.art",

			"mybootclasspathfragment-dexpreopt-arm64-boot.oat",

			"mybootclasspathfragment-dexpreopt-arm64-boot.vdex",

			"mybootclasspathfragment-dexpreopt-arm64-boot-bar.art",

			"mybootclasspathfragment-dexpreopt-arm64-boot-bar.oat",

			"mybootclasspathfragment-dexpreopt-arm64-boot-bar.vdex",

			"mybootclasspathfragment-dexpreopt-arm-boot.art",

			"mybootclasspathfragment-dexpreopt-arm-boot.oat",

			"mybootclasspathfragment-dexpreopt-arm-boot.vdex",

			"mybootclasspathfragment-dexpreopt-arm-boot-bar.art",

			"mybootclasspathfragment-dexpreopt-arm-boot-bar.oat",

			"mybootclasspathfragment-dexpreopt-arm-boot-bar.vdex",

		})

	})



	t.Run("source with inconsistency between config and contents", func(t *testing.T) {

		android.GroupFixturePreparers(

			commonPreparer,
@@ -782,10 +629,6 @@ func TestBootclasspathFragmentInPrebuiltArtApex(t *testing.T) { 


		module := result.ModuleForTests("mybootclasspathfragment", "android_common_com.android.art")

		checkCopiesToPredefinedLocationForArt(t, result.Config, module, "bar", "foo")



		// Check that the right deapexer module was chosen for a boot image.

		param := module.Output("out/soong/dexpreopt_arm64/dex_artjars/android/apex/art_boot_images/javalib/arm64/boot.art")

		android.AssertStringDoesContain(t, "didn't find the expected deapexer in the input path", param.Input.String(), "/com.android.art.deapexer")

	})



	t.Run("enabled alternative APEX", func(t *testing.T) {
@@ -1250,7 +1093,7 @@ func TestBootclasspathFragment_AndroidNonUpdatable(t *testing.T) { 
func TestBootclasspathFragment_AndroidNonUpdatable_AlwaysUsePrebuiltSdks(t *testing.T) {

	result := android.GroupFixturePreparers(

		prepareForTestWithBootclasspathFragment,

		java.PrepareForTestWithJavaDefaultModules,

		java.PrepareForTestWithDexpreopt,

		prepareForTestWithArtApex,

		prepareForTestWithMyapex,

		// Configure bootclasspath jars to ensure that hidden API encoding is performed on them.

apex/dexpreopt_bootjars_test.go

0 → 100644
+254 −0
Original line number Diff line number Diff line 
// Copyright 2019 Google Inc. All rights reserved.

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//     http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



package apex



import (

	"fmt"

	"path/filepath"

	"sort"

	"testing"



	"android/soong/android"

	"android/soong/java"

)



func testDexpreoptBoot(t *testing.T, ruleFile string, expectedInputs, expectedOutputs []string, preferPrebuilt bool) {

	bp := `

		// Platform.



		java_sdk_library {

			name: "foo",

			srcs: ["a.java"],

			api_packages: ["foo"],

		}



		java_library {

			name: "bar",

			srcs: ["b.java"],

			installable: true,

			system_ext_specific: true,

		}



		dex_import {

			name: "baz",

			jars: ["a.jar"],

		}



		platform_bootclasspath {

			name: "platform-bootclasspath",

			fragments: [

				{

					apex: "com.android.art",

					module: "art-bootclasspath-fragment",

				},

			],

		}



		// Source ART APEX.



		java_library {

			name: "core-oj",

			srcs: ["core-oj.java"],

			installable: true,

			apex_available: [

				"com.android.art",

			],

		}



		bootclasspath_fragment {

			name: "art-bootclasspath-fragment",

			image_name: "art",

			contents: ["core-oj"],

			apex_available: [

				"com.android.art",

			],

			hidden_api: {

				split_packages: ["*"],

			},

		}



		apex_key {

			name: "com.android.art.key",

			public_key: "com.android.art.avbpubkey",

			private_key: "com.android.art.pem",

		}



		apex {

			name: "com.android.art",

			key: "com.android.art.key",

			bootclasspath_fragments: ["art-bootclasspath-fragment"],

			updatable: false,

		}



		// Prebuilt ART APEX.



		java_import {

			name: "core-oj",

			prefer: %[1]t,

			jars: ["core-oj.jar"],

			apex_available: [

				"com.android.art",

			],

		}



		prebuilt_bootclasspath_fragment {

			name: "art-bootclasspath-fragment",

			prefer: %[1]t,

			image_name: "art",

			contents: ["core-oj"],

			hidden_api: {

				annotation_flags: "my-bootclasspath-fragment/annotation-flags.csv",

				metadata: "my-bootclasspath-fragment/metadata.csv",

				index: "my-bootclasspath-fragment/index.csv",

				stub_flags: "my-bootclasspath-fragment/stub-flags.csv",

				all_flags: "my-bootclasspath-fragment/all-flags.csv",

			},

			apex_available: [

				"com.android.art",

			],

		}



		prebuilt_apex {

			name: "com.android.art",

			prefer: %[1]t,

			apex_name: "com.android.art",

			src: "com.android.art-arm.apex",

			exported_bootclasspath_fragments: ["art-bootclasspath-fragment"],

		}

	`



	result := android.GroupFixturePreparers(

		java.PrepareForTestWithDexpreopt,

		java.PrepareForTestWithJavaSdkLibraryFiles,

		java.FixtureWithLastReleaseApis("foo"),

		java.FixtureConfigureBootJars("com.android.art:core-oj", "platform:foo", "system_ext:bar", "platform:baz"),

		PrepareForTestWithApexBuildComponents,

		prepareForTestWithArtApex,

	).RunTestWithBp(t, fmt.Sprintf(bp, preferPrebuilt))



	platformBootclasspath := result.ModuleForTests("platform-bootclasspath", "android_common")

	rule := platformBootclasspath.Output(ruleFile)



	inputs := rule.Implicits.Strings()

	sort.Strings(inputs)

	sort.Strings(expectedInputs)



	outputs := append(android.WritablePaths{rule.Output}, rule.ImplicitOutputs...).Strings()

	sort.Strings(outputs)

	sort.Strings(expectedOutputs)



	android.AssertStringPathsRelativeToTopEquals(t, "inputs", result.Config, expectedInputs, inputs)



	android.AssertStringPathsRelativeToTopEquals(t, "outputs", result.Config, expectedOutputs, outputs)

}



func TestDexpreoptBootJarsWithSourceArtApex(t *testing.T) {

	ruleFile := "boot.art"



	expectedInputs := []string{

		"out/soong/dexpreopt_arm64/dex_bootjars_input/core-oj.jar",

		"out/soong/dexpreopt_arm64/dex_bootjars_input/foo.jar",

		"out/soong/dexpreopt_arm64/dex_bootjars_input/bar.jar",

		"out/soong/dexpreopt_arm64/dex_bootjars_input/baz.jar",

		"out/soong/dexpreopt_arm64/dex_artjars/boot.prof",

		"out/soong/dexpreopt_arm64/dex_bootjars/boot.prof",

	}



	expectedOutputs := []string{

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot.invocation",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot.art",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-foo.art",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-bar.art",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-baz.art",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot.oat",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-foo.oat",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-bar.oat",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-baz.oat",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot.vdex",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-foo.vdex",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-bar.vdex",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-baz.vdex",

		"out/soong/dexpreopt_arm64/dex_bootjars_unstripped/android/system/framework/arm64/boot.oat",

		"out/soong/dexpreopt_arm64/dex_bootjars_unstripped/android/system/framework/arm64/boot-foo.oat",

		"out/soong/dexpreopt_arm64/dex_bootjars_unstripped/android/system/framework/arm64/boot-bar.oat",

		"out/soong/dexpreopt_arm64/dex_bootjars_unstripped/android/system/framework/arm64/boot-baz.oat",

	}



	testDexpreoptBoot(t, ruleFile, expectedInputs, expectedOutputs, false)

}



// The only difference is that the ART profile should be deapexed from the prebuilt APEX. Other

// inputs and outputs should be the same as above.

func TestDexpreoptBootJarsWithPrebuiltArtApex(t *testing.T) {

	ruleFile := "boot.art"



	expectedInputs := []string{

		"out/soong/dexpreopt_arm64/dex_bootjars_input/core-oj.jar",

		"out/soong/dexpreopt_arm64/dex_bootjars_input/foo.jar",

		"out/soong/dexpreopt_arm64/dex_bootjars_input/bar.jar",

		"out/soong/dexpreopt_arm64/dex_bootjars_input/baz.jar",

		"out/soong/.intermediates/com.android.art.deapexer/android_common/deapexer/etc/boot-image.prof",

		"out/soong/dexpreopt_arm64/dex_bootjars/boot.prof",

	}



	expectedOutputs := []string{

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot.invocation",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot.art",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-foo.art",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-bar.art",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-baz.art",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot.oat",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-foo.oat",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-bar.oat",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-baz.oat",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot.vdex",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-foo.vdex",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-bar.vdex",

		"out/soong/dexpreopt_arm64/dex_bootjars/android/system/framework/arm64/boot-baz.vdex",

		"out/soong/dexpreopt_arm64/dex_bootjars_unstripped/android/system/framework/arm64/boot.oat",

		"out/soong/dexpreopt_arm64/dex_bootjars_unstripped/android/system/framework/arm64/boot-foo.oat",

		"out/soong/dexpreopt_arm64/dex_bootjars_unstripped/android/system/framework/arm64/boot-bar.oat",

		"out/soong/dexpreopt_arm64/dex_bootjars_unstripped/android/system/framework/arm64/boot-baz.oat",

	}



	testDexpreoptBoot(t, ruleFile, expectedInputs, expectedOutputs, true)

}



// Changes to the boot.zip structure may break the ART APK scanner.

func TestDexpreoptBootZip(t *testing.T) {

	ruleFile := "boot.zip"



	ctx := android.PathContextForTesting(android.TestArchConfig("", nil, "", nil))

	expectedInputs := []string{}

	for _, target := range ctx.Config().Targets[android.Android] {

		for _, ext := range []string{".art", ".oat", ".vdex"} {

			for _, suffix := range []string{"", "-foo", "-bar", "-baz"} {

				expectedInputs = append(expectedInputs,

					filepath.Join(

						"out/soong/dexpreopt_arm64/dex_bootjars",

						target.Os.String(),

						"system/framework",

						target.Arch.ArchType.String(),

						"boot"+suffix+ext))

			}

		}

	}



	expectedOutputs := []string{

		"out/soong/dexpreopt_arm64/dex_bootjars/boot.zip",

	}



	testDexpreoptBoot(t, ruleFile, expectedInputs, expectedOutputs, false)

}