Merge "Remove deps from Soong intermediate to symbols" (d0d420d3) · Commits · e / os / android_build_soong

apex/apex_test.go

+12 −3

Original line number	Diff line number	Diff line
		@@ -5716,6 +5716,7 @@ func TestPrebuiltSkipsSymbols(t *testing.T) {
		// Source module
		apex {
		name: "myapex",
		binaries: ["foo"],
		key: "myapex.key",
		updatable: false,
		}
		@@ -5731,11 +5732,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)
		})
		}

+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