Merge "disable usage of plugins as static libs" into tm-mainline-prod
diff --git a/android/gen_notice.go b/android/gen_notice.go
index e2b839f..2eb6bec 100644
--- a/android/gen_notice.go
+++ b/android/gen_notice.go
@@ -179,7 +179,7 @@
// 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
diff --git a/android/gen_notice_test.go b/android/gen_notice_test.go
index 4ad2ecf..b45ce4f 100644
--- a/android/gen_notice_test.go
+++ b/android/gen_notice_test.go
@@ -12,19 +12,6 @@
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{
"top/Android.bp": []byte(`