From b03165f9fcae20eab6f247d6e0088306121e7b01 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 12 Jan 2023 18:53:55 +0800
Subject: [PATCH] Disable buildFeatures flags by default (#3241)

---
 SystemUIShared/build.gradle | 3 +++
 build.gradle                | 3 +++
 gradle.properties           | 6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/SystemUIShared/build.gradle b/SystemUIShared/build.gradle
index c5358b9a75..11b325ce06 100644
--- a/SystemUIShared/build.gradle
+++ b/SystemUIShared/build.gradle
@@ -5,6 +5,9 @@ plugins {
 
 android {
     namespace "com.android.systemui.shared"
+    buildFeatures {
+        aidl true
+    }
     sourceSets {
         main {
             java.srcDirs = ['src']
diff --git a/build.gradle b/build.gradle
index 753b64132b..a99abc1d05 100644
--- a/build.gradle
+++ b/build.gradle
@@ -147,7 +147,10 @@ android {
     }
 
     buildFeatures {
+        aidl true
+        buildConfig true
         compose true
+        resValues true
     }
 
     composeOptions {
diff --git a/gradle.properties b/gradle.properties
index b6c75e758e..e9d8e2d49a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,9 @@
+# Disable buildFeatures flags by default
+android.defaults.buildfeatures.aidl=false
+android.defaults.buildfeatures.buildconfig=false
+android.defaults.buildfeatures.renderscript=false
+android.defaults.buildfeatures.resvalues=false
+android.defaults.buildfeatures.shaders=false
 # https://developer.android.com/studio/build/shrink-code#full-mode
 android.enableR8.fullMode=true
 android.nonTransitiveRClass=true