Merge "Fix gen_notice init to support arch and dist." am: 5aa5dc4121 am: a17300b55a am: 09872407b5

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2212476

Change-Id: Ifa3b764ac3a3653d8e7be44063a3b544153ccf17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

android/gen_notice.go

@@ -179,7 +179,7 @@ func GenNoticeFactory() Module {
 	// The visibility property needs to be checked and parsed by the visibility module.
 	setPrimaryVisibilityProperty(module, "visibility", &module.properties.Visibility)
 
-	initAndroidModuleBase(module)
+	InitAndroidArchModule(module, DeviceSupported, MultilibCommon)
 	InitDefaultableModule(module)
 
 	return module

android/gen_notice_test.go

@@ -11,19 +11,6 @@ var genNoticeTests = []struct {
 	fs             MockFS
 	expectedErrors []string
 }{
-	{
-		name: "gen_notice must not accept licenses property",
-		fs: map[string][]byte{
-			"top/Android.bp": []byte(`
-				gen_notice {
-					name: "top_license",
-					licenses: ["other_license"],
-				}`),
-		},
-		expectedErrors: []string{
-			`unrecognized property "licenses"`,
-		},
-	},
 	{
 		name: "bad gen_notice",
 		fs: map[string][]byte{