Merge "Remove libvintf from libandroid_runtime" into main (a4db376f) · Commits · e / os / android_frameworks_base

config/preloaded-classes

+0 −2

Original line number	Diff line number	Diff line
		@@ -6265,8 +6265,6 @@ android.os.VibratorInfo$FrequencyProfile$1
		android.os.VibratorInfo$FrequencyProfile
		android.os.VibratorInfo
		android.os.VibratorManager
		android.os.VintfObject
		android.os.VintfRuntimeInfo
		android.os.WorkSource$1
		android.os.WorkSource$WorkChain$1
		android.os.WorkSource$WorkChain

+4 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,10 @@ public class VintfObject {

		private static final String LOG_TAG = "VintfObject";

		static {
		System.loadLibrary("vintf_jni");
		}

		/**
		* Slurps all device information (both manifests and both matrices)
		* and report them.

+4 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,10 @@ public class VintfRuntimeInfo {

		private VintfRuntimeInfo() {}

		static {
		System.loadLibrary("vintf_jni");
		}

		/**
		* @return /sys/fs/selinux/policyvers, via security_policyvers() native call
		*

+19 −4

Original line number	Diff line number	Diff line
		@@ -182,8 +182,6 @@ cc_library_shared_for_libandroid_runtime {
		"android_os_SharedMemory.cpp",
		"android_os_storage_StorageManager.cpp",
		"android_os_UEventObserver.cpp",
		"android_os_VintfObject.cpp",
		"android_os_VintfRuntimeInfo.cpp",
		"android_os_incremental_IncrementalManager.cpp",
		"android_net_LocalSocketImpl.cpp",
		"android_service_DataLoaderService.cpp",
		@@ -271,6 +269,7 @@ cc_library_shared_for_libandroid_runtime {
		"libdmabufinfo",
		"libgif",
		"libgui_window_info_static",
		"libkernelconfigs",
		"libseccomp_policy",
		"libgrallocusage",
		"libscrypt_static",
		@@ -340,7 +339,6 @@ cc_library_shared_for_libandroid_runtime {
		"libnativeloader_lazy",
		"libmemunreachable",
		"libhidlbase",
		"libvintf",
		"libnativedisplay",
		"libnativewindow",
		"libdl",
		@@ -448,8 +446,25 @@ cc_library_shared_for_libandroid_runtime {
		// (e.g. gDefaultServiceManager)
		"libbinder",
		"libhidlbase", // libhwbinder is in here
		"libvintf",
		],
		},
		},
		}

		cc_library_shared {
		name: "libvintf_jni",

		cpp_std: "gnu++20",

		srcs: [
		"android_os_VintfObject.cpp",
		"android_os_VintfRuntimeInfo.cpp",
		],

		shared_libs: [
		"libbase",
		"liblog",
		"libnativehelper",
		"libvintf",
		],
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -151,8 +151,6 @@ extern int register_android_os_MessageQueue(JNIEnv* env);
		extern int register_android_os_Parcel(JNIEnv* env);
		extern int register_android_os_PerformanceHintManager(JNIEnv* env);
		extern int register_android_os_SELinux(JNIEnv* env);
		extern int register_android_os_VintfObject(JNIEnv *env);
		extern int register_android_os_VintfRuntimeInfo(JNIEnv *env);
		extern int register_android_os_storage_StorageManager(JNIEnv* env);
		extern int register_android_os_SystemProperties(JNIEnv *env);
		extern int register_android_os_SystemClock(JNIEnv* env);
		@@ -1541,8 +1539,6 @@ static const RegJNIRec gRegJNI[] = {
		REG_JNI(register_android_os_NativeHandle),
		REG_JNI(register_android_os_ServiceManager),
		REG_JNI(register_android_os_storage_StorageManager),
		REG_JNI(register_android_os_VintfObject),
		REG_JNI(register_android_os_VintfRuntimeInfo),
		REG_JNI(register_android_service_DataLoaderService),
		REG_JNI(register_android_view_DisplayEventReceiver),
		REG_JNI(register_android_view_Surface),