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

Commit 8ea6bc4a authored by Jiyong Park's avatar Jiyong Park Committed by Gerrit Code Review
Browse files

Merge "Revert "m <apex_name>-deps-info prints the internal/external deps of the APEX""

parents 36746d21 4513f703

apex/androidmk.go

+2 −2
Original line number Diff line number Diff line
@@ -216,8 +216,8 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData { 
				if len(moduleNames) > 0 {

					fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES +=", strings.Join(moduleNames, " "))

				}

				if len(a.requiredDeps) > 0 {

					fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES +=", strings.Join(a.requiredDeps, " "))

				if len(a.externalDeps) > 0 {

					fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES +=", strings.Join(a.externalDeps, " "))

				}

				a.writeRequiredModules(w)

				var postInstallCommands []string

apex/apex.go

+5 −19
Original line number Diff line number Diff line
@@ -520,13 +520,8 @@ type apexBundle struct { 
	// list of files to be included in this apex

	filesInfo []apexFile



	// list of module names that should be installed along with this APEX

	requiredDeps []string



	// list of module names that this APEX is depending on (to be shown via *-deps-info target)

	// list of module names that this APEX is depending on

	externalDeps []string

	// list of module names that this APEX is including (to be shown via *-deps-info target)

	internalDeps []string



	testApex        bool

	vndkApex        bool
@@ -950,7 +945,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
			a.primaryApexType = true



			if ctx.Config().InstallExtraFlattenedApexes() {

				a.requiredDeps = append(a.requiredDeps, a.Name()+flattenedSuffix)

				a.externalDeps = append(a.externalDeps, a.Name()+flattenedSuffix)

			}

		}

	case zipApex:
@@ -1009,9 +1004,6 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
		depTag := ctx.OtherModuleDependencyTag(child)

		depName := ctx.OtherModuleName(child)

		if _, isDirectDep := parent.(*apexBundle); isDirectDep {

			if depTag != keyTag && depTag != certificateTag {

				a.internalDeps = append(a.internalDeps, depName)

			}

			switch depTag {

			case sharedLibTag:

				if cc, ok := child.(*cc.Module); ok {
@@ -1142,10 +1134,9 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
							//

							// Always include if we are a host-apex however since those won't have any

							// system libraries.

							if !android.DirectlyInAnyApex(ctx, cc.Name()) && !android.InList(cc.Name(), a.requiredDeps) {

								a.requiredDeps = append(a.requiredDeps, cc.Name())

							if !android.DirectlyInAnyApex(ctx, cc.Name()) && !android.InList(cc.Name(), a.externalDeps) {

								a.externalDeps = append(a.externalDeps, cc.Name())

							}

							a.externalDeps = append(a.externalDeps, depName)

							requireNativeLibs = append(requireNativeLibs, cc.OutputFile().Path().Base())

							// Don't track further

							return false
@@ -1153,8 +1144,6 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
						af := apexFileForNativeLibrary(ctx, cc, handleSpecialLibs)

						af.transitiveDep = true

						filesInfo = append(filesInfo, af)

						a.internalDeps = append(a.internalDeps, depName)

						a.internalDeps = append(a.internalDeps, cc.AllStaticDeps()...)

						return true // track transitive dependencies

					}

				} else if cc.IsTestPerSrcDepTag(depTag) {
@@ -1170,10 +1159,8 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
						return true // track transitive dependencies

					}

				} else if java.IsJniDepTag(depTag) {

					a.externalDeps = append(a.externalDeps, depName)

					// Do nothing for JNI dep. JNI libraries are always embedded in APK-in-APEX.

					return true

				} else if java.IsStaticLibDepTag(depTag) {

					a.internalDeps = append(a.internalDeps, depName)

				} else if am.CanHaveApexVariants() && am.IsInstallableToApex() {

					ctx.ModuleErrorf("unexpected tag %q for indirect dependency %q", depTag, depName)

				}
@@ -1271,7 +1258,6 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { 


	apexName := proptools.StringDefault(a.properties.Apex_name, a.Name())

	a.compatSymlinks = makeCompatSymlinks(apexName, ctx)

	a.buildApexDependencyInfo(ctx)

}



func newApexBundle() *apexBundle {

apex/apex_test.go

+6 −19
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ func testApexContext(t *testing.T, bp string, handlers ...testCustomizer) (*andr 
		"apex_manifest.json":                                  nil,

		"AndroidManifest.xml":                                 nil,

		"system/sepolicy/apex/myapex-file_contexts":           nil,

		"system/sepolicy/apex/myapex2-file_contexts":          nil,

		"system/sepolicy/apex/otherapex-file_contexts":        nil,

		"system/sepolicy/apex/commonapex-file_contexts":       nil,

		"system/sepolicy/apex/com.android.vndk-file_contexts": nil,
@@ -521,12 +520,6 @@ func TestBasicApex(t *testing.T) { 
	}

	ensureListContains(t, noticeInputs, "NOTICE")

	ensureListContains(t, noticeInputs, "custom_notice")



	depsInfo := strings.Split(ctx.ModuleForTests("myapex", "android_common_myapex_image").Output("myapex-deps-info.txt").Args["content"], "\\n")

	ensureListContains(t, depsInfo, "internal myjar")

	ensureListContains(t, depsInfo, "internal mylib")

	ensureListContains(t, depsInfo, "internal mylib2")

	ensureListContains(t, depsInfo, "internal myotherjar")

}



func TestDefaults(t *testing.T) {
@@ -747,13 +740,13 @@ func TestApexWithStubs(t *testing.T) { 
func TestApexWithExplicitStubsDependency(t *testing.T) {

	ctx, _ := testApex(t, `

		apex {

			name: "myapex2",

			key: "myapex2.key",

			name: "myapex",

			key: "myapex.key",

			native_shared_libs: ["mylib"],

		}



		apex_key {

			name: "myapex2.key",

			name: "myapex.key",

			public_key: "testkey.avbpubkey",

			private_key: "testkey.pem",

		}
@@ -786,7 +779,7 @@ func TestApexWithExplicitStubsDependency(t *testing.T) { 


	`)



	apexRule := ctx.ModuleForTests("myapex2", "android_common_myapex2_image").Rule("apexRule")

	apexRule := ctx.ModuleForTests("myapex", "android_common_myapex_image").Rule("apexRule")

	copyCmds := apexRule.Args["copy_commands"]



	// Ensure that direct non-stubs dep is always included
@@ -798,7 +791,7 @@ func TestApexWithExplicitStubsDependency(t *testing.T) { 
	// Ensure that dependency of stubs is not included

	ensureNotContains(t, copyCmds, "image.apex/lib64/libbar.so")



	mylibLdFlags := ctx.ModuleForTests("mylib", "android_arm64_armv8-a_shared_myapex2").Rule("ld").Args["libFlags"]

	mylibLdFlags := ctx.ModuleForTests("mylib", "android_arm64_armv8-a_shared_myapex").Rule("ld").Args["libFlags"]



	// Ensure that mylib is linking with version 10 of libfoo

	ensureContains(t, mylibLdFlags, "libfoo/android_arm64_armv8-a_shared_10/libfoo.so")
@@ -809,12 +802,6 @@ func TestApexWithExplicitStubsDependency(t *testing.T) { 


	// Ensure that libfoo stubs is not linking to libbar (since it is a stubs)

	ensureNotContains(t, libFooStubsLdFlags, "libbar.so")



	depsInfo := strings.Split(ctx.ModuleForTests("myapex2", "android_common_myapex2_image").Output("myapex2-deps-info.txt").Args["content"], "\\n")

	ensureListContains(t, depsInfo, "internal mylib")

	ensureListContains(t, depsInfo, "external libfoo")

	ensureListNotContains(t, depsInfo, "internal libfoo")

	ensureListNotContains(t, depsInfo, "external mylib")

}



func TestApexWithRuntimeLibsDependency(t *testing.T) {
@@ -2665,7 +2652,7 @@ func TestInstallExtraFlattenedApexes(t *testing.T) { 
		config.TestProductVariables.InstallExtraFlattenedApexes = proptools.BoolPtr(true)

	})

	ab := ctx.ModuleForTests("myapex", "android_common_myapex_image").Module().(*apexBundle)

	ensureListContains(t, ab.requiredDeps, "myapex.flattened")

	ensureListContains(t, ab.externalDeps, "myapex.flattened")

	mk := android.AndroidMkDataForTest(t, config, "", ab)

	var builder strings.Builder

	mk.Custom(&builder, ab.Name(), "TARGET_", "", mk)

apex/builder.go

+0 −37
Original line number Diff line number Diff line
@@ -554,40 +554,3 @@ func (a *apexBundle) getOverrideManifestPackageName(ctx android.ModuleContext) s 
	}

	return ""

}
 


func (a *apexBundle) buildApexDependencyInfo(ctx android.ModuleContext) {

	if !a.primaryApexType {

		return

	}



	internalDeps := a.internalDeps

	externalDeps := a.externalDeps



	internalDeps = android.SortedUniqueStrings(internalDeps)

	externalDeps = android.SortedUniqueStrings(externalDeps)

	externalDeps = android.RemoveListFromList(externalDeps, internalDeps)



	var content strings.Builder

	for _, name := range internalDeps {

		fmt.Fprintf(&content, "internal %s\\n", name)

	}

	for _, name := range externalDeps {

		fmt.Fprintf(&content, "external %s\\n", name)

	}



	depsInfoFile := android.PathForOutput(ctx, a.Name()+"-deps-info.txt")

	ctx.Build(pctx, android.BuildParams{

		Rule:        android.WriteFile,

		Description: "Dependency Info",

		Output:      depsInfoFile,

		Args: map[string]string{

			"content": content.String(),

		},

	})



	ctx.Build(pctx, android.BuildParams{

		Rule:   android.Phony,

		Output: android.PathForPhony(ctx, a.Name()+"-deps-info"),

		Inputs: []android.Path{depsInfoFile},

	})

}

cc/cc.go

+0 −25
Original line number Diff line number Diff line
@@ -398,13 +398,6 @@ func IsSharedDepTag(depTag blueprint.DependencyTag) bool { 
	return ok && ccDepTag.Shared

}



func IsStaticDepTag(depTag blueprint.DependencyTag) bool {

	ccDepTag, ok := depTag.(DependencyTag)

	return ok && (ccDepTag == staticExportDepTag ||

		ccDepTag == lateStaticDepTag ||

		ccDepTag == wholeStaticDepTag)

}



func IsRuntimeDepTag(depTag blueprint.DependencyTag) bool {

	ccDepTag, ok := depTag.(DependencyTag)

	return ok && ccDepTag == runtimeDepTag
@@ -470,9 +463,6 @@ type Module struct { 
	makeLinkType string

	// Kythe (source file indexer) paths for this compilation module

	kytheFiles android.Paths



	// name of the modules that are direct or indirect static deps of this module

	allStaticDeps []string

}



func (c *Module) Toc() android.OptionalPath {
@@ -1268,15 +1258,6 @@ func orderStaticModuleDeps(module LinkableInterface, staticDeps []LinkableInterf 
	return results

}



func gatherTransitiveStaticDeps(staticDeps []LinkableInterface) []string {

	var ret []string

	for _, dep := range staticDeps {

		ret = append(ret, dep.Module().Name())

		ret = append(ret, dep.AllStaticDeps()...)

	}

	return android.FirstUniqueStrings(ret)

}



func (c *Module) IsTestPerSrcAllTestsVariation() bool {

	test, ok := c.linker.(testPerSrc)

	return ok && test.isAllTestsVariation()
@@ -2347,8 +2328,6 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps { 
		c.sabi.Properties.ReexportedIncludes = android.FirstUniqueStrings(c.sabi.Properties.ReexportedIncludes)

	}



	c.allStaticDeps = gatherTransitiveStaticDeps(directStaticDeps)



	return depPaths

}
@@ -2484,10 +2463,6 @@ func (c *Module) installable() bool { 
	return c.installer != nil && !c.Properties.PreventInstall && c.IsForPlatform() && c.outputFile.Valid()

}



func (c *Module) AllStaticDeps() []string {

	return c.allStaticDeps

}



func (c *Module) AndroidMkWriteAdditionalDependenciesForSourceAbiDiff(w io.Writer) {

	if c.linker != nil {

		if library, ok := c.linker.(*libraryDecorator); ok {