Require CONFIG_USB_RTL8152 != n if we have host usb support.
We want to require the r8152 usb ethernet gigabit dongle driver
on any device with a usb host port (like the USB-C port on a standard
phone).
ie. we want:
CONFIG_USB in {m,y} --> CONFIG_USB_RTL8152 in {m,y}
which can be logically reversed to
CONFIG_USB_RTL8152 = n --> CONFIG_USB = n
which is implementable with current conditional xml syntax.
Bug: 110755806
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0fabe8c48536fbc597751afd34418e4ff42a06c6
diff --git a/android-4.14/android-base-conditional.xml b/android-4.14/android-base-conditional.xml
index fb01d35..9893c0a 100644
--- a/android-4.14/android-base-conditional.xml
+++ b/android-4.14/android-base-conditional.xml
@@ -143,3 +143,17 @@
</config>
</group>
+<!-- CONFIG_USB implies CONFIG_USB_RTL8152 -->
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_USB_RTL8152</key>
+ <value type="bool">n</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_USB</key>
+ <value type="bool">n</value>
+ </config>
+</group>
+
diff --git a/android-4.19/android-base-conditional.xml b/android-4.19/android-base-conditional.xml
index f9afcec..ff373f6 100644
--- a/android-4.19/android-base-conditional.xml
+++ b/android-4.19/android-base-conditional.xml
@@ -143,3 +143,17 @@
</config>
</group>
+<!-- CONFIG_USB implies CONFIG_USB_RTL8152 -->
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_USB_RTL8152</key>
+ <value type="bool">n</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_USB</key>
+ <value type="bool">n</value>
+ </config>
+</group>
+
diff --git a/android-4.9/android-base-conditional.xml b/android-4.9/android-base-conditional.xml
index 9d55ccf..db6d5bd 100644
--- a/android-4.9/android-base-conditional.xml
+++ b/android-4.9/android-base-conditional.xml
@@ -147,3 +147,17 @@
</config>
</group>
+<!-- CONFIG_USB implies CONFIG_USB_RTL8152 -->
+<group>
+ <conditions>
+ <config>
+ <key>CONFIG_USB_RTL8152</key>
+ <value type="bool">n</value>
+ </config>
+ </conditions>
+ <config>
+ <key>CONFIG_USB</key>
+ <value type="bool">n</value>
+ </config>
+</group>
+
