Merge "Do not install debug packages for user build" into main (0739ee8e) · Commits · e / os / android_build

target/product/generic/Android.bp

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -470,7 +470,6 @@ android_filesystem_defaults {
	"locksettings", // base_system		"locksettings", // base_system
	"logcat", // base_system		"logcat", // base_system
	"logd", // base_system		"logd", // base_system
	"logpersist.start",
	"lpdump", // base_system		"lpdump", // base_system
	"lshal", // base_system		"lshal", // base_system
	"make_f2fs", // media_system		"make_f2fs", // media_system
	@@ -527,7 +526,6 @@ android_filesystem_defaults {
	"sfdo", // base_system		"sfdo", // base_system
	"sgdisk", // base_system		"sgdisk", // base_system
	"sm", // base_system		"sm", // base_system
	"snapshotctl", // base_system
	"snapuserd", // base_system		"snapuserd", // base_system
	"storaged", // base_system		"storaged", // base_system
	"surfaceflinger", // base_system		"surfaceflinger", // base_system
	@@ -585,6 +583,7 @@ android_filesystem_defaults {
	"iperf3",		"iperf3",
	"iw",		"iw",
	"layertracegenerator",		"layertracegenerator",
			"logpersist.start",
	"logtagd.rc",		"logtagd.rc",
	"ot-cli-ftd",		"ot-cli-ftd",
	"ot-ctl",		"ot-ctl",
	@@ -595,6 +594,7 @@ android_filesystem_defaults {
	"sanitizer-status",		"sanitizer-status",
	"servicedispatcher",		"servicedispatcher",
	"showmap",		"showmap",
			"snapshotctl",
	"sqlite3",		"sqlite3",
	"ss",		"ss",
	"start_with_lockagent",		"start_with_lockagent",
	@@ -911,4 +911,9 @@ android_system_image {
	compressor: "lz4hc,9",		compressor: "lz4hc,9",
	compress_hints: "erofs_compress_hints.txt",		compress_hints: "erofs_compress_hints.txt",
	},		},
			deps: [
			// DO NOT update this list. Instead, update the system_image_defaults to
			// sync with the base_system.mk
			"logpersist.start", // cf only
			],
	}		}