From 9e61dce7be27897a3c94bd85c6355c0e66b2eedb Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Sat, 1 Jul 2023 11:47:25 +0200
Subject: [PATCH] enable fossAutomotive variant

refs #281
---
 app/build.gradle                                           | 7 -------
 .../{googleAutomotive => automotive}/AndroidManifest.xml   | 0
 .../res/values-de/strings.xml                              | 0
 .../res/values-fr/strings.xml                              | 0
 .../res/values-nb-rNO/strings.xml                          | 0
 .../res/values-nl/strings.xml                              | 0
 .../res/values-pt/strings.xml                              | 0
 .../res/values-ro/strings.xml                              | 0
 .../res/values/strings.xml                                 | 0
 9 files changed, 7 deletions(-)
 rename app/src/{googleAutomotive => automotive}/AndroidManifest.xml (100%)
 rename app/src/{googleAutomotive => automotive}/res/values-de/strings.xml (100%)
 rename app/src/{googleAutomotive => automotive}/res/values-fr/strings.xml (100%)
 rename app/src/{googleAutomotive => automotive}/res/values-nb-rNO/strings.xml (100%)
 rename app/src/{googleAutomotive => automotive}/res/values-nl/strings.xml (100%)
 rename app/src/{googleAutomotive => automotive}/res/values-pt/strings.xml (100%)
 rename app/src/{googleAutomotive => automotive}/res/values-ro/strings.xml (100%)
 rename app/src/{googleAutomotive => automotive}/res/values/strings.xml (100%)

diff --git a/app/build.gradle b/app/build.gradle
index 25f81c9d..e30e0d54 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -73,13 +73,6 @@ android {
             minSdkVersion 29
         }
     }
-    variantFilter { variant ->
-        def names = variant.flavors*.name
-        // Android Automotive OS app is always based on Google variant
-        if (names.contains("automotive") && !names.contains("google")) {
-            setIgnore(true)
-        }
-    }
 
     compileOptions {
         coreLibraryDesugaringEnabled true
diff --git a/app/src/googleAutomotive/AndroidManifest.xml b/app/src/automotive/AndroidManifest.xml
similarity index 100%
rename from app/src/googleAutomotive/AndroidManifest.xml
rename to app/src/automotive/AndroidManifest.xml
diff --git a/app/src/googleAutomotive/res/values-de/strings.xml b/app/src/automotive/res/values-de/strings.xml
similarity index 100%
rename from app/src/googleAutomotive/res/values-de/strings.xml
rename to app/src/automotive/res/values-de/strings.xml
diff --git a/app/src/googleAutomotive/res/values-fr/strings.xml b/app/src/automotive/res/values-fr/strings.xml
similarity index 100%
rename from app/src/googleAutomotive/res/values-fr/strings.xml
rename to app/src/automotive/res/values-fr/strings.xml
diff --git a/app/src/googleAutomotive/res/values-nb-rNO/strings.xml b/app/src/automotive/res/values-nb-rNO/strings.xml
similarity index 100%
rename from app/src/googleAutomotive/res/values-nb-rNO/strings.xml
rename to app/src/automotive/res/values-nb-rNO/strings.xml
diff --git a/app/src/googleAutomotive/res/values-nl/strings.xml b/app/src/automotive/res/values-nl/strings.xml
similarity index 100%
rename from app/src/googleAutomotive/res/values-nl/strings.xml
rename to app/src/automotive/res/values-nl/strings.xml
diff --git a/app/src/googleAutomotive/res/values-pt/strings.xml b/app/src/automotive/res/values-pt/strings.xml
similarity index 100%
rename from app/src/googleAutomotive/res/values-pt/strings.xml
rename to app/src/automotive/res/values-pt/strings.xml
diff --git a/app/src/googleAutomotive/res/values-ro/strings.xml b/app/src/automotive/res/values-ro/strings.xml
similarity index 100%
rename from app/src/googleAutomotive/res/values-ro/strings.xml
rename to app/src/automotive/res/values-ro/strings.xml
diff --git a/app/src/googleAutomotive/res/values/strings.xml b/app/src/automotive/res/values/strings.xml
similarity index 100%
rename from app/src/googleAutomotive/res/values/strings.xml
rename to app/src/automotive/res/values/strings.xml