Merge "PackageManagerNative: Include app's sourceDir" into main (55d95ed4) · Commits · e / os / android_frameworks_base

services/core/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -251,6 +251,7 @@ java_library_static {
		"uprobestats_flags_java_lib",
		"clipboard_flags_lib",
		"aconfig_adbdauth_flags_java_lib",
		"AvfBuildFlags",
		],
		javac_shard_size: 50,
		javacflags: [

+5 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import android.content.pm.StagedApexInfo;
		import android.os.Binder;
		import android.os.RemoteException;
		import android.os.UserHandle;
		import android.system.virtualmachine.BuildFlags;
		import android.text.TextUtils;
		import android.util.Slog;

		@@ -82,6 +83,10 @@ final class PackageManagerNative extends IPackageManagerNative.Stub {

		PackageInfoNative result = new PackageInfoNative();
		result.packageName = packageName;

		if (BuildFlags.SUPPORT_AVF_ADVANCE_MULTITENANCY && pInfo.applicationInfo != null) {
		result.sourceDir = pInfo.applicationInfo.sourceDir;
		}
		if (pInfo.signingInfo == null) {
		return result;
		}

+2 −0

Original line number	Diff line number	Diff line
		# For profiling flags
		rule android.os.profiling.** android.internal.os.profiling.@1
		# AVF build flags
		rule android.system.virtualmachine.BuildFlags** android.system.virtualmachine.AvfBuildFlags@1