Merge "Fix android_gsi dirs and symlinks" into main (7089890f) · Commits · e / os / android_build

target/product/generic/Android.bp

+4 −4

Original line number	Diff line number	Diff line
		@@ -55,10 +55,6 @@ generic_symlinks = [
		target: "/data/user_de/0/com.android.shell/files/bugreports",
		name: "bugreports",
		},
		{
		target: "/data/cache",
		name: "cache",
		},
		{
		target: "/sys/kernel/debug",
		name: "d",
		@@ -125,6 +121,10 @@ android_symlinks = [
		target: "/system_ext",
		name: "system/system_ext",
		},
		{
		target: "/data/cache",
		name: "cache",
		},
		]

		filegroup {

+9 −0

Original line number	Diff line number	Diff line
		@@ -71,12 +71,21 @@ gsi_symlinks = [
		target: "/system/product",
		name: "product",
		},
		{
		target: "/odm/odm_dlkm/etc",
		name: "odm_dlkm/etc",
		},
		{
		target: "/vendor/vendor_dlkm/etc",
		name: "vendor_dlkm/etc",
		},
		]

		android_system_image {
		name: "android_gsi",
		defaults: ["system_image_defaults"],
		symlinks: gsi_symlinks,
		dirs: ["cache"],
		deps: [
		///////////////////////////////////////////
		// gsi_system_ext