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

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

Revert "APK-in-APEX should set use_embedded_native_libs: true" 

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: I3064caef0cb55d1594951835a1173c667f58e607
parent f14b5ba8

apex/apex_test.go

+0 −1
Original line number Diff line number Diff line
@@ -5908,7 +5908,6 @@ func TestApexWithApps(t *testing.T) { 
			srcs: ["foo/bar/MyClass.java"],

			sdk_version: "current",

			system_modules: "none",

			use_embedded_native_libs: true,

			jni_libs: ["libjni"],

			stl: "none",

			apex_available: [ "myapex" ],

java/app.go

+2 −14
Original line number Diff line number Diff line
@@ -334,7 +334,6 @@ func (a *AndroidTestHelperApp) GenerateAndroidBuildActions(ctx android.ModuleCon 


func (a *AndroidApp) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	a.checkAppSdkVersions(ctx)

	a.checkEmbedJnis(ctx)

	a.generateAndroidBuildActions(ctx)

	a.generateJavaUsedByApex(ctx)

}
@@ -379,17 +378,6 @@ func (a *AndroidApp) checkAppSdkVersions(ctx android.ModuleContext) { 
	a.checkSdkVersions(ctx)

}



// Ensures that use_embedded_native_libs are set for apk-in-apex

func (a *AndroidApp) checkEmbedJnis(ctx android.BaseModuleContext) {

	apexInfo, _ := android.ModuleProvider(ctx, android.ApexInfoProvider)

	apkInApex := !apexInfo.IsForPlatform()

	hasJnis := len(a.appProperties.Jni_libs) > 0



	if apkInApex && hasJnis && !Bool(a.appProperties.Use_embedded_native_libs) {

		ctx.ModuleErrorf("APK in APEX should have use_embedded_native_libs: true")

	}

}



// If an updatable APK sets min_sdk_version, min_sdk_vesion of JNI libs should match with it.

// This check is enforced for "updatable" APKs (including APK-in-APEX).

func (a *AndroidApp) checkJniLibsSdkVersion(ctx android.ModuleContext, minSdkVersion android.ApiLevel) {
@@ -445,9 +433,9 @@ func (a *AndroidApp) shouldUncompressDex(ctx android.ModuleContext) bool { 
}



func (a *AndroidApp) shouldEmbedJnis(ctx android.BaseModuleContext) bool {

	apexInfo, _ := android.ModuleProvider(ctx, android.ApexInfoProvider)

	return ctx.Config().UnbundledBuild() || Bool(a.appProperties.Use_embedded_native_libs) ||

		Bool(a.appProperties.Updatable) ||

		a.appProperties.AlwaysPackageNativeLibs

		!apexInfo.IsForPlatform() || a.appProperties.AlwaysPackageNativeLibs

}



func generateAaptRenamePackageFlags(packageName string, renameResourcesPackage bool) []string {