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

Commit 343d09e7 authored by Dennis Shen's avatar Dennis Shen
Browse files

create flag info file in mainline build 

Bug: b/301491148
Test: m
Change-Id: I2a0abe215510acb78526b0e1c68b5881af7997fd
parent 3a9a37cc

apex/apex_test.go

+12 −6
Original line number Diff line number Diff line
@@ -10277,14 +10277,15 @@ func TestAconfigFilesJavaDeps(t *testing.T) { 
	mod := ctx.ModuleForTests("myapex", "android_common_myapex")

	s := mod.Rule("apexRule").Args["copy_commands"]

	copyCmds := regexp.MustCompile(" *&& *").Split(s, -1)

	if len(copyCmds) != 12 {

		t.Fatalf("Expected 12 commands, got %d in:\n%s", len(copyCmds), s)

	if len(copyCmds) != 14 {

		t.Fatalf("Expected 14 commands, got %d in:\n%s", len(copyCmds), s)

	}



	ensureListContainsMatch(t, copyCmds, "^cp -f .*/aconfig_flags.pb .*/image.apex/etc/aconfig_flags.pb")

	ensureListContainsMatch(t, copyCmds, "^cp -f .*/package.map .*/image.apex/etc/package.map")

	ensureListContainsMatch(t, copyCmds, "^cp -f .*/flag.map .*/image.apex/etc/flag.map")

	ensureListContainsMatch(t, copyCmds, "^cp -f .*/flag.val .*/image.apex/etc/flag.val")

	ensureListContainsMatch(t, copyCmds, "^cp -f .*/flag.info.*/image.apex/etc/flag.info")



	inputs := []string{

		"my_aconfig_declarations_foo/intermediate.pb",
@@ -10294,6 +10295,7 @@ func TestAconfigFilesJavaDeps(t *testing.T) { 
	VerifyAconfigRule(t, &mod, "create_aconfig_package_map_file", inputs, "android_common_myapex/package.map", "myapex", "package_map")

	VerifyAconfigRule(t, &mod, "create_aconfig_flag_map_file", inputs, "android_common_myapex/flag.map", "myapex", "flag_map")

	VerifyAconfigRule(t, &mod, "create_aconfig_flag_val_file", inputs, "android_common_myapex/flag.val", "myapex", "flag_val")

	VerifyAconfigRule(t, &mod, "create_aconfig_flag_info_file", inputs, "android_common_myapex/flag.info", "myapex", "flag_info")

}



func TestAconfigFilesJavaAndCcDeps(t *testing.T) {
@@ -10412,14 +10414,15 @@ func TestAconfigFilesJavaAndCcDeps(t *testing.T) { 
	mod := ctx.ModuleForTests("myapex", "android_common_myapex")

	s := mod.Rule("apexRule").Args["copy_commands"]

	copyCmds := regexp.MustCompile(" *&& *").Split(s, -1)

	if len(copyCmds) != 16 {

		t.Fatalf("Expected 16 commands, got %d in:\n%s", len(copyCmds), s)

	if len(copyCmds) != 18 {

		t.Fatalf("Expected 18 commands, got %d in:\n%s", len(copyCmds), s)

	}



	ensureListContainsMatch(t, copyCmds, "^cp -f .*/aconfig_flags.pb .*/image.apex/etc/aconfig_flags.pb")

	ensureListContainsMatch(t, copyCmds, "^cp -f .*/package.map .*/image.apex/etc/package.map")

	ensureListContainsMatch(t, copyCmds, "^cp -f .*/flag.map .*/image.apex/etc/flag.map")

	ensureListContainsMatch(t, copyCmds, "^cp -f .*/flag.val .*/image.apex/etc/flag.val")

	ensureListContainsMatch(t, copyCmds, "^cp -f .*/flag.info .*/image.apex/etc/flag.info")



	inputs := []string{

		"my_aconfig_declarations_foo/intermediate.pb",
@@ -10430,6 +10433,7 @@ func TestAconfigFilesJavaAndCcDeps(t *testing.T) { 
	VerifyAconfigRule(t, &mod, "create_aconfig_package_map_file", inputs, "android_common_myapex/package.map", "myapex", "package_map")

	VerifyAconfigRule(t, &mod, "create_aconfig_flag_map_file", inputs, "android_common_myapex/flag.map", "myapex", "flag_map")

	VerifyAconfigRule(t, &mod, "create_aconfig_flag_val_file", inputs, "android_common_myapex/flag.val", "myapex", "flag_val")

	VerifyAconfigRule(t, &mod, "create_aconfig_flag_info_file", inputs, "android_common_myapex/flag.info", "myapex", "flag_info")

}



func TestAconfigFilesRustDeps(t *testing.T) {
@@ -10580,14 +10584,15 @@ func TestAconfigFilesRustDeps(t *testing.T) { 
	mod := ctx.ModuleForTests("myapex", "android_common_myapex")

	s := mod.Rule("apexRule").Args["copy_commands"]

	copyCmds := regexp.MustCompile(" *&& *").Split(s, -1)

	if len(copyCmds) != 36 {

		t.Fatalf("Expected 36 commands, got %d in:\n%s", len(copyCmds), s)

	if len(copyCmds) != 38 {

		t.Fatalf("Expected 38 commands, got %d in:\n%s", len(copyCmds), s)

	}



	ensureListContainsMatch(t, copyCmds, "^cp -f .*/aconfig_flags.pb .*/image.apex/etc/aconfig_flags.pb")

	ensureListContainsMatch(t, copyCmds, "^cp -f .*/package.map .*/image.apex/etc/package.map")

	ensureListContainsMatch(t, copyCmds, "^cp -f .*/flag.map .*/image.apex/etc/flag.map")

	ensureListContainsMatch(t, copyCmds, "^cp -f .*/flag.val .*/image.apex/etc/flag.val")

	ensureListContainsMatch(t, copyCmds, "^cp -f .*/flag.info .*/image.apex/etc/flag.info")



	inputs := []string{

		"my_aconfig_declarations_foo/intermediate.pb",
@@ -10599,6 +10604,7 @@ func TestAconfigFilesRustDeps(t *testing.T) { 
	VerifyAconfigRule(t, &mod, "create_aconfig_package_map_file", inputs, "android_common_myapex/package.map", "myapex", "package_map")

	VerifyAconfigRule(t, &mod, "create_aconfig_flag_map_file", inputs, "android_common_myapex/flag.map", "myapex", "flag_map")

	VerifyAconfigRule(t, &mod, "create_aconfig_flag_val_file", inputs, "android_common_myapex/flag.val", "myapex", "flag_val")

	VerifyAconfigRule(t, &mod, "create_aconfig_flag_info_file", inputs, "android_common_myapex/flag.info", "myapex", "flag_info")

}



func VerifyAconfigRule(t *testing.T, mod *android.TestingModule, desc string, inputs []string, output string, container string, file_type string) {

apex/builder.go

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ var createStorageInfo = []createStorageStruct{ 
	{"package.map", "create_aconfig_package_map_file", "package_map"},

	{"flag.map", "create_aconfig_flag_map_file", "flag_map"},

	{"flag.val", "create_aconfig_flag_val_file", "flag_val"},

	{"flag.info", "create_aconfig_flag_info_file", "flag_info"},

}



var (