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

Commit b7646e4d authored by Yu Shan's avatar Yu Shan
Browse files

Revert "Install jni symlinks in Soong" 

Revert submission 3088867

Reason for revert: On cf_auto build, we are seeing a symlink of jni lib pointing to lib64/libcarservicejni.so, which does not exist on the device.

Reverted changes: /q/submissionid:3088867
Bug: b/341335305

Change-Id: Ie4ff26fe47e1a0ab5e97b185c61cb94473cc5fb8
parent d5e435d7

java/androidmk.go

+18 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package java 
import (

	"fmt"

	"io"

	"strings"



	"android/soong/android"
@@ -412,6 +413,23 @@ func (app *AndroidApp) AndroidMkEntries() []android.AndroidMkEntries { 
				if app.embeddedJniLibs {

					jniSymbols := app.JNISymbolsInstalls(app.installPathForJNISymbols.String())

					entries.SetString("LOCAL_SOONG_JNI_LIBS_SYMBOLS", jniSymbols.String())

				} else {

					for _, jniLib := range app.jniLibs {

						entries.AddStrings("LOCAL_SOONG_JNI_LIBS_"+jniLib.target.Arch.ArchType.String(), jniLib.name)

						var partitionTag string



						// Mimic the creation of partition_tag in build/make,

						// which defaults to an empty string when the partition is system.

						// Otherwise, capitalize with a leading _

						if jniLib.partition == "system" {

							partitionTag = ""

						} else {

							split := strings.Split(jniLib.partition, "/")

							partitionTag = "_" + strings.ToUpper(split[len(split)-1])

						}

						entries.AddStrings("LOCAL_SOONG_JNI_LIBS_PARTITION_"+jniLib.target.Arch.ArchType.String(),

							jniLib.name+":"+partitionTag)

					}

				}



				if len(app.jniCoverageOutputs) > 0 {

java/androidmk_test.go

+149 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ import ( 
	"testing"



	"android/soong/android"

	"android/soong/cc"



	"github.com/google/blueprint/proptools"

)



func TestRequired(t *testing.T) {
@@ -252,3 +255,149 @@ func TestGetOverriddenPackages(t *testing.T) { 
		android.AssertDeepEquals(t, "overrides property", expected.overrides, actual)

	}

}



func TestJniPartition(t *testing.T) {

	bp := `

		cc_library {

			name: "libjni_system",

			system_shared_libs: [],

			sdk_version: "current",

			stl: "none",

		}



		cc_library {

			name: "libjni_system_ext",

			system_shared_libs: [],

			sdk_version: "current",

			stl: "none",

			system_ext_specific: true,

		}



		cc_library {

			name: "libjni_odm",

			system_shared_libs: [],

			sdk_version: "current",

			stl: "none",

			device_specific: true,

		}



		cc_library {

			name: "libjni_product",

			system_shared_libs: [],

			sdk_version: "current",

			stl: "none",

			product_specific: true,

		}



		cc_library {

			name: "libjni_vendor",

			system_shared_libs: [],

			sdk_version: "current",

			stl: "none",

			soc_specific: true,

		}



		android_app {

			name: "test_app_system_jni_system",

			privileged: true,

			platform_apis: true,

			certificate: "platform",

			jni_libs: ["libjni_system"],

		}



		android_app {

			name: "test_app_system_jni_system_ext",

			privileged: true,

			platform_apis: true,

			certificate: "platform",

			jni_libs: ["libjni_system_ext"],

		}



		android_app {

			name: "test_app_system_ext_jni_system",

			privileged: true,

			platform_apis: true,

			certificate: "platform",

			jni_libs: ["libjni_system"],

			system_ext_specific: true

		}



		android_app {

			name: "test_app_system_ext_jni_system_ext",

			sdk_version: "core_platform",

			jni_libs: ["libjni_system_ext"],

			system_ext_specific: true

		}



		android_app {

			name: "test_app_product_jni_product",

			sdk_version: "core_platform",

			jni_libs: ["libjni_product"],

			product_specific: true

		}



		android_app {

			name: "test_app_vendor_jni_odm",

			sdk_version: "core_platform",

			jni_libs: ["libjni_odm"],

			soc_specific: true

		}



		android_app {

			name: "test_app_odm_jni_vendor",

			sdk_version: "core_platform",

			jni_libs: ["libjni_vendor"],

			device_specific: true

		}

		android_app {

			name: "test_app_system_jni_multiple",

			privileged: true,

			platform_apis: true,

			certificate: "platform",

			jni_libs: ["libjni_system", "libjni_system_ext"],

		}

		android_app {

			name: "test_app_vendor_jni_multiple",

			sdk_version: "core_platform",

			jni_libs: ["libjni_odm", "libjni_vendor"],

			soc_specific: true

		}

		`

	arch := "arm64"

	ctx := android.GroupFixturePreparers(

		PrepareForTestWithJavaDefaultModules,

		cc.PrepareForTestWithCcDefaultModules,

		android.PrepareForTestWithAndroidMk,

		android.FixtureModifyConfig(func(config android.Config) {

			config.TestProductVariables.DeviceArch = proptools.StringPtr(arch)

		}),

	).

		RunTestWithBp(t, bp)

	testCases := []struct {

		name           string

		partitionNames []string

		partitionTags  []string

	}{

		{"test_app_system_jni_system", []string{"libjni_system"}, []string{""}},

		{"test_app_system_jni_system_ext", []string{"libjni_system_ext"}, []string{"_SYSTEM_EXT"}},

		{"test_app_system_ext_jni_system", []string{"libjni_system"}, []string{""}},

		{"test_app_system_ext_jni_system_ext", []string{"libjni_system_ext"}, []string{"_SYSTEM_EXT"}},

		{"test_app_product_jni_product", []string{"libjni_product"}, []string{"_PRODUCT"}},

		{"test_app_vendor_jni_odm", []string{"libjni_odm"}, []string{"_ODM"}},

		{"test_app_odm_jni_vendor", []string{"libjni_vendor"}, []string{"_VENDOR"}},

		{"test_app_system_jni_multiple", []string{"libjni_system", "libjni_system_ext"}, []string{"", "_SYSTEM_EXT"}},

		{"test_app_vendor_jni_multiple", []string{"libjni_odm", "libjni_vendor"}, []string{"_ODM", "_VENDOR"}},

	}



	for _, test := range testCases {

		t.Run(test.name, func(t *testing.T) {

			mod := ctx.ModuleForTests(test.name, "android_common").Module()

			entry := android.AndroidMkEntriesForTest(t, ctx.TestContext, mod)[0]

			for i := range test.partitionNames {

				actual := entry.EntryMap["LOCAL_SOONG_JNI_LIBS_PARTITION_"+arch][i]

				expected := test.partitionNames[i] + ":" + test.partitionTags[i]

				android.AssertStringEquals(t, "Expected and actual differ", expected, actual)

			}

		})

	}

}

java/app.go

+0 −21
Original line number Diff line number Diff line
@@ -911,26 +911,6 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { 
			installed := ctx.InstallFile(a.installDir, extra.Base(), extra)

			extraInstalledPaths = append(extraInstalledPaths, installed)

		}

		// If we don't embed jni libs, make sure that those are installed along with the

		// app, and also place symlinks to the installed paths under the lib/<arch>

		// directory of the app installation directory. ex:

		// /system/app/MyApp/lib/arm64/libfoo.so -> /system/lib64/libfoo.so

		if !a.embeddedJniLibs {

			for _, jniLib := range jniLibs {

				archStr := jniLib.target.Arch.ArchType.String()

				symlinkDir := a.installDir.Join(ctx, "lib", archStr)

				for _, installedLib := range jniLib.installPaths {

					// install the symlink target along with the app

					extraInstalledPaths = append(extraInstalledPaths, installedLib)

					ctx.PackageFile(installedLib, "", jniLib.path)



					// install the symlink itself

					symlinkName := installedLib.Base()

					symlinkTarget := android.InstallPathToOnDevicePath(ctx, installedLib)

					ctx.InstallAbsoluteSymlink(symlinkDir, symlinkName, symlinkTarget)

				}

			}

		}

		ctx.InstallFile(a.installDir, a.outputFile.Base(), a.outputFile, extraInstalledPaths...)

	}
@@ -1018,7 +998,6 @@ func collectJniDeps(ctx android.ModuleContext, 
						coverageFile:   dep.CoverageOutputFile(),

						unstrippedFile: dep.UnstrippedOutputFile(),

						partition:      dep.Partition(),

						installPaths:   dep.FilesToInstall(),

					})

				} else if ctx.Config().AllowMissingDependencies() {

					ctx.AddMissingDependencies([]string{otherName})

java/java.go

+0 −1
Original line number Diff line number Diff line
@@ -491,7 +491,6 @@ type jniLib struct { 
	coverageFile   android.OptionalPath

	unstrippedFile android.Path

	partition      string

	installPaths   android.InstallPaths

}



func sdkDeps(ctx android.BottomUpMutatorContext, sdkContext android.SdkContext, d dexer) {