diff options
| author | mullerf <mullerf@google.com> | 2021-03-16 10:47:57 -0700 |
|---|---|---|
| committer | Florian Muller <mullerf@google.com> | 2021-03-16 17:55:50 +0000 |
| commit | 2a52cf876d830072b369d5986a0bae9b52770bb8 (patch) | |
| tree | 99254da6196f28e9d80adbb4a89a05123f5a79c7 | |
| parent | 9d38479ac8a7c23a055b5ae97fe78f464212e59c (diff) | |
| download | config-2a52cf876d830072b369d5986a0bae9b52770bb8.tar.gz | |
Update config for Android R
On Android R, CONFIG_IP6_NF_NAT and subsequently the config flags that
rely on it are not allowed, causing build errors.
Test: `adb shell downloader` is still working in both "WiFi" and "BT
proxy only" cases
Bug: 160151746
Signed-off-by: mullerf <mullerf@google.com>
Change-Id: Ie7a08a013e4db63830533f458b89cb0e7a6b2446
| -rw-r--r-- | r11_defconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/r11_defconfig b/r11_defconfig index 9d109bc..56f6cd7 100644 --- a/r11_defconfig +++ b/r11_defconfig @@ -184,9 +184,6 @@ CONFIG_IP6_NF_FILTER=y CONFIG_IP6_NF_TARGET_REJECT=y CONFIG_IP6_NF_MANGLE=y CONFIG_IP6_NF_RAW=y -CONFIG_IP6_NF_NAT=y -CONFIG_IP6_NF_TARGET_MASQUERADE=y -CONFIG_IP6_NF_TARGET_NPT=y CONFIG_L2TP=y CONFIG_PHONET=y CONFIG_NET_SCHED=y |