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

Commit 4654fab1 authored by Jiakai Zhang's avatar Jiakai Zhang Committed by Automerger Merge Worker
Browse files

Prepare tests for dexpreopt changes. am: c67528bf am: b0b019ed 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23206714



Change-Id: I8c02372ecaab2eb372bd46e5e402380abbbdb4a5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4c6b833e b0b019ed

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_test.go

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

	bpf.PrepareForTestWithBpf,

	cc.PrepareForTestWithCcBuildComponents,

	java.PrepareForTestWithJavaDefaultModules,

	java.PrepareForTestWithDexpreopt,

	prebuilt_etc.PrepareForTestWithPrebuiltEtc,

	rust.PrepareForTestWithRustDefaultModules,

	sh.PrepareForTestWithShBuildComponents,

apex/bootclasspath_fragment_test.go

+1 −1
Original line number Diff line number Diff line
@@ -1250,7 +1250,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.

java/dexpreopt_bootjars_test.go→apex/dexpreopt_bootjars_test.go

+6 −5
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



package java

package apex



import (

	"path/filepath"
@@ -20,6 +20,7 @@ import ( 
	"testing"



	"android/soong/android"

	"android/soong/java"

)



func testDexpreoptBoot(t *testing.T, ruleFile string, expectedInputs, expectedOutputs []string) {
@@ -48,10 +49,10 @@ func testDexpreoptBoot(t *testing.T, ruleFile string, expectedInputs, expectedOu 
	`



	result := android.GroupFixturePreparers(

		prepareForJavaTest,

		PrepareForTestWithJavaSdkLibraryFiles,

		FixtureWithLastReleaseApis("foo"),

		FixtureConfigureBootJars("platform:foo", "system_ext:bar", "platform:baz"),

		java.PrepareForTestWithDexpreopt,

		java.PrepareForTestWithJavaSdkLibraryFiles,

		java.FixtureWithLastReleaseApis("foo"),

		java.FixtureConfigureBootJars("platform:foo", "system_ext:bar", "platform:baz"),

	).RunTestWithBp(t, bp)



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

apex/metadata_test.go

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import ( 
func TestModulesSingleton(t *testing.T) {

	result := android.GroupFixturePreparers(

		PrepareForTestWithApexMultitreeSingleton,

		java.PrepareForTestWithDexpreopt,

		java.PrepareForTestWithJavaDefaultModules,

		PrepareForTestWithApexBuildComponents,

		java.FixtureConfigureApexBootJars("myapex:foo"),

		java.PrepareForTestWithJavaSdkLibraryFiles,