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

Commit 5bedfee4 authored by Inseob Kim's avatar Inseob Kim
Browse files

Remove deps from Soong intermediate to symbols 

These should be handled by Makefile dependency (LOCAL_REQUIRED_MODULES).

Bug: 278832320
Test: build and see symbol files
Change-Id: I80ad9d8e7e8384e2ae3537cc681bc1d1b327d04c
parent dc0a4021

apex/apex_test.go

+12 −3
Original line number Diff line number Diff line
@@ -5673,6 +5673,7 @@ func TestPrebuiltSkipsSymbols(t *testing.T) { 
				// Source module

				apex {

					name: "myapex",

					binaries: ["foo"],

					key: "myapex.key",

					updatable: false,

				}
@@ -5688,11 +5689,19 @@ func TestPrebuiltSkipsSymbols(t *testing.T) { 
					set: "myapex.apks",

					`+preferProperty+`

				}



				cc_binary {

					name: "foo",

					srcs: ["mylib.cpp"],

					system_shared_libs: [],

					stl: "none",

					apex_available: [ "myapex" ],

				}

			`)

			// Symbol files are installed by installing entries under ${OUT}/apex/{apex name}

			android.AssertStringListContainsEquals(t, "Implicits",

				ctx.ModuleForTests("myapex", "android_common_myapex_image").Rule("apexRule").Implicits.Strings(),

				"out/soong/target/product/test_device/apex/myapex/apex_manifest.pb",

			android.AssertStringListContainsEquals(t, "Installs",

				ctx.ModuleForTests("myapex", "android_common_myapex_image").Module().FilesToInstall().Strings(),

				filepath.Join(ctx.Config().SoongOutDir(), "target/product/test_device/apex/myapex/bin/foo"),

				tc.installSymbolFiles)

		})

	}

apex/builder.go

+1 −10
Original line number Diff line number Diff line
@@ -517,9 +517,6 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
				}

			}

			implicitInputs = append(implicitInputs, fi.builtFile)

			if installSymbolFiles {

				implicitInputs = append(implicitInputs, installedPath)

			}



			// Create additional symlinks pointing the file inside the APEX (if any). Note that

			// this is independent from the symlink optimization.
@@ -527,8 +524,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
				symlinkDest := imageDir.Join(ctx, symlinkPath).String()

				copyCommands = append(copyCommands, "ln -sfn "+filepath.Base(destPath)+" "+symlinkDest)

				if installSymbolFiles {

					installedSymlink := ctx.InstallSymlink(apexDir.Join(ctx, filepath.Dir(symlinkPath)), filepath.Base(symlinkPath), installedPath)

					implicitInputs = append(implicitInputs, installedSymlink)

					ctx.InstallSymlink(apexDir.Join(ctx, filepath.Dir(symlinkPath)), filepath.Base(symlinkPath), installedPath)

				}

			}
@@ -553,11 +549,6 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
		installMapSet[installMapPath.String()+":"+fi.installDir+"/"+fi.builtFile.Base()] = true

	}

	implicitInputs = append(implicitInputs, a.manifestPbOut)

	if installSymbolFiles {

		installedManifest := ctx.InstallFile(apexDir, "apex_manifest.pb", a.manifestPbOut)

		installedKey := ctx.InstallFile(apexDir, "apex_pubkey", a.publicKeyFile)

		implicitInputs = append(implicitInputs, installedManifest, installedKey)

	}



	if len(installMapSet) > 0 {

		var installs []string