From 604e2a8cef8a99cd7170603d7cdb49cfd252eb0e Mon Sep 17 00:00:00 2001
From: Kushal Dave <kushal@scroll.com>
Date: Thu, 19 Mar 2020 11:48:20 -0700
Subject: [PATCH] Allow amp-access and amp-subscriptions to coexist (#27280)

Although the valdiator error is useful for pushing users to
avoid errors, in practice amp-access and amp-subscriptions
appear to coexist fine. This change is needed to allow
amp-subscriptions users to also use amp-access-scroll to
let Scroll customers avoid ads.
---
 extensions/amp-access/validator-amp-access.protoascii     | 2 --
 .../0.1/test/validator-amp-subscriptions-errors.out       | 8 ++------
 .../validator-amp-subscriptions.protoascii                | 4 +---
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/extensions/amp-access/validator-amp-access.protoascii b/extensions/amp-access/validator-amp-access.protoascii
index 2226348dd596..043f6202e3c9 100644
--- a/extensions/amp-access/validator-amp-access.protoascii
+++ b/extensions/amp-access/validator-amp-access.protoascii
@@ -32,8 +32,6 @@ tags: {  # amp-access (json)
   unique: true
   mandatory_parent: "HEAD"
   requires_extension: "amp-access"
-  satisfies: "amp-access extension .json script"
-  excludes: "amp-subscriptions extension .json script"
   attrs: {
     name: "id"
     mandatory: true
diff --git a/extensions/amp-subscriptions/0.1/test/validator-amp-subscriptions-errors.out b/extensions/amp-subscriptions/0.1/test/validator-amp-subscriptions-errors.out
index 764a7afbff61..25e8c2cca2cd 100644
--- a/extensions/amp-subscriptions/0.1/test/validator-amp-subscriptions-errors.out
+++ b/extensions/amp-subscriptions/0.1/test/validator-amp-subscriptions-errors.out
@@ -1,4 +1,4 @@
-FAIL
+PASS
 |  <!--
 |    Copyright 2018 The AMP HTML Authors. All Rights Reserved.
 |
@@ -71,8 +71,4 @@ FAIL
 |      Dialog for non logged in users
 |    </template>
 |  </body>
-|  </html>
->>       ^~~~~~~~~
-amp-subscriptions/0.1/test/validator-amp-subscriptions-errors.html:73:6 The tag 'amp-access extension .json script' is present, but is excluded by the presence of 'amp-subscriptions extension .json script'. (see https://amp.dev/documentation/components/amp-access)
->>       ^~~~~~~~~
-amp-subscriptions/0.1/test/validator-amp-subscriptions-errors.html:73:6 The tag 'amp-subscriptions extension .json script' is present, but is excluded by the presence of 'amp-access extension .json script'. (see https://amp.dev/documentation/components/amp-subscriptions)
+|  </html>
\ No newline at end of file
diff --git a/extensions/amp-subscriptions/validator-amp-subscriptions.protoascii b/extensions/amp-subscriptions/validator-amp-subscriptions.protoascii
index 925a7796d880..e79f3827906c 100644
--- a/extensions/amp-subscriptions/validator-amp-subscriptions.protoascii
+++ b/extensions/amp-subscriptions/validator-amp-subscriptions.protoascii
@@ -31,9 +31,7 @@ tags: {  # amp-subscriptions (json)
   spec_name: "amp-subscriptions extension .json script"
   unique: true
   mandatory_parent: "HEAD"
-  requires_extension: "amp-subscriptions"
-  satisfies: "amp-subscriptions extension .json script"
-  excludes: "amp-access extension .json script"
+  requires_extension: "amp-subscriptions"  
   attrs: {
     name: "id"
     mandatory: true