Merge "SdkLibraryImport's DexJarInstallPath uses installPath from source module" (257608f9) · Commits · e / os / android_build_soong

apex/apex_test.go

+22 −6

Original line number	Diff line number	Diff line
		@@ -4687,16 +4687,26 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) {
		p := ctx.ModuleForTests(name, "android_common_myapex").Module().(java.UsesLibraryDependency)
		dexJarBuildPath := p.DexJarBuildPath()
		stem := android.RemoveOptionalPrebuiltPrefix(name)
		if expected, actual := ".intermediates/myapex.deapexer/android_common/deapexer/javalib/"+stem+".jar", android.NormalizePathForTesting(dexJarBuildPath); actual != expected {
		t.Errorf("Incorrect DexJarBuildPath value '%s', expected '%s'", actual, expected)
		android.AssertStringEquals(t, "DexJarBuildPath should be apex-related path.",
		".intermediates/myapex.deapexer/android_common/deapexer/javalib/"+stem+".jar",
		android.NormalizePathForTesting(dexJarBuildPath))
		}

		checkDexJarInstallPath := func(t testing.T, ctx android.TestContext, name string) {
		// Make sure the import has been given the correct path to the dex jar.
		p := ctx.ModuleForTests(name, "android_common_myapex").Module().(java.UsesLibraryDependency)
		dexJarBuildPath := p.DexJarInstallPath()
		stem := android.RemoveOptionalPrebuiltPrefix(name)
		android.AssertStringEquals(t, "DexJarInstallPath should be apex-related path.",
		"target/product/test_device/apex/myapex/javalib/"+stem+".jar",
		android.NormalizePathForTesting(dexJarBuildPath))
		}

		ensureNoSourceVariant := func(t testing.T, ctx android.TestContext, name string) {
		// Make sure that an apex variant is not created for the source module.
		if expected, actual := []string{"android_common"}, ctx.ModuleVariantsForTests(name); !reflect.DeepEqual(expected, actual) {
		t.Errorf("invalid set of variants for %q: expected %q, found %q", "libfoo", expected, actual)
		}
		android.AssertArrayString(t, "Check if there is no source variant",
		[]string{"android_common"},
		ctx.ModuleVariantsForTests(name))
		}

		t.Run("prebuilt only", func(t *testing.T) {
		@@ -4745,8 +4755,10 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) {
		}

		checkDexJarBuildPath(t, ctx, "libfoo")
		checkDexJarInstallPath(t, ctx, "libfoo")

		checkDexJarBuildPath(t, ctx, "libbar")
		checkDexJarInstallPath(t, ctx, "libbar")
		})

		t.Run("prebuilt with source preferred", func(t *testing.T) {
		@@ -4792,9 +4804,11 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) {
		ctx := testDexpreoptWithApexes(t, bp, "", transform)

		checkDexJarBuildPath(t, ctx, "prebuilt_libfoo")
		checkDexJarInstallPath(t, ctx, "prebuilt_libfoo")
		ensureNoSourceVariant(t, ctx, "libfoo")

		checkDexJarBuildPath(t, ctx, "prebuilt_libbar")
		checkDexJarInstallPath(t, ctx, "prebuilt_libbar")
		ensureNoSourceVariant(t, ctx, "libbar")
		})

		@@ -4842,9 +4856,11 @@ func TestPrebuiltExportDexImplementationJars(t *testing.T) {
		ctx := testDexpreoptWithApexes(t, bp, "", transform)

		checkDexJarBuildPath(t, ctx, "prebuilt_libfoo")
		checkDexJarInstallPath(t, ctx, "prebuilt_libfoo")
		ensureNoSourceVariant(t, ctx, "libfoo")

		checkDexJarBuildPath(t, ctx, "prebuilt_libbar")
		checkDexJarInstallPath(t, ctx, "prebuilt_libbar")
		ensureNoSourceVariant(t, ctx, "libbar")
		})
		}

java/java.go

+5 −2

Original line number	Diff line number	Diff line
		@@ -1167,6 +1167,7 @@ type Import struct {

		// output file containing classes.dex and resources
		dexJarFile android.Path
		dexJarInstallFile android.Path

		combinedClasspathFile android.Path
		classLoaderContexts dexpreopt.ClassLoaderContextMap
		@@ -1311,6 +1312,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		di := ctx.OtherModuleProvider(deapexerModule, android.DeapexerProvider).(android.DeapexerInfo)
		if dexOutputPath := di.PrebuiltExportPath(apexRootRelativePathToJavaLib(j.BaseModuleName())); dexOutputPath != nil {
		j.dexJarFile = dexOutputPath
		j.dexJarInstallFile = android.PathForModuleInPartitionInstall(ctx, "apex", ai.ApexVariationName, apexRootRelativePathToJavaLib(j.BaseModuleName()))

		// Initialize the hiddenapi structure.
		j.initHiddenAPI(ctx, dexOutputPath, outputFile, nil)
		@@ -1351,6 +1353,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		dexOutputFile = j.hiddenAPIEncodeDex(ctx, dexOutputFile)

		j.dexJarFile = dexOutputFile
		j.dexJarInstallFile = android.PathForModuleInstall(ctx, "framework", jarName)
		}
		}

		@@ -1392,7 +1395,7 @@ func (j *Import) DexJarBuildPath() android.Path {
		}

		func (j *Import) DexJarInstallPath() android.Path {
		return nil
		return j.dexJarInstallFile
		}

		func (j *Import) ClassLoaderContexts() dexpreopt.ClassLoaderContextMap {

java/sdk_library.go

+10 −6

Original line number	Diff line number	Diff line
		@@ -1923,8 +1923,12 @@ type SdkLibraryImport struct {
		// Is nil if the source module does not exist.
		xmlPermissionsFileModule *sdkLibraryXml

		// Path to the dex implementation jar obtained from the prebuilt_apex, if any.
		// Build path to the dex implementation jar obtained from the prebuilt_apex, if any.
		dexJarFile android.Path

		// Expected install file path of the source module(sdk_library)
		// or dex implementation jar obtained from the prebuilt_apex, if any.
		installFile android.Path
		}

		var _ SdkLibraryDependency = (*SdkLibraryImport)(nil)
		@@ -2136,6 +2140,9 @@ func (module *SdkLibraryImport) GenerateAndroidBuildActions(ctx android.ModuleCo

		var deapexerModule android.Module

		// Assume that source module(sdk_library) is installed in /<sdk_library partition>/framework
		module.installFile = android.PathForModuleInstall(ctx, "framework", module.Stem()+".jar")

		// Record the paths to the prebuilt stubs library and stubs source.
		ctx.VisitDirectDeps(func(to android.Module) {
		tag := ctx.OtherModuleDependencyTag(to)
		@@ -2195,6 +2202,7 @@ func (module *SdkLibraryImport) GenerateAndroidBuildActions(ctx android.ModuleCo
		di := ctx.OtherModuleProvider(deapexerModule, android.DeapexerProvider).(android.DeapexerInfo)
		if dexOutputPath := di.PrebuiltExportPath(apexRootRelativePathToJavaLib(module.BaseModuleName())); dexOutputPath != nil {
		module.dexJarFile = dexOutputPath
		module.installFile = android.PathForModuleInPartitionInstall(ctx, "apex", ai.ApexVariationName, apexRootRelativePathToJavaLib(module.BaseModuleName()))
		module.initHiddenAPI(ctx, dexOutputPath, module.findScopePaths(apiScopePublic).stubsImplPath[0], nil)
		} else {
		// This should never happen as a variant for a prebuilt_apex is only created if the
		@@ -2249,11 +2257,7 @@ func (module *SdkLibraryImport) DexJarBuildPath() android.Path {

		// to satisfy UsesLibraryDependency interface
		func (module *SdkLibraryImport) DexJarInstallPath() android.Path {
		if module.implLibraryModule == nil {
		return nil
		} else {
		return module.implLibraryModule.DexJarInstallPath()
		}
		return module.installFile
		}

		// to satisfy UsesLibraryDependency interface