commit 621fb8ff10fedfed6f201a45f69d8a9c4c75d8a5
author George Lin <giolin@google.com> Fri Jul 29 21:13:41 2022 +0000
committer George Lin <giolin@google.com> Wed Aug 10 17:07:46 2022 +0000
tree 2b5c3dac2bbe448c1db625d4c3f6da4f390c3dbe
parent 108dc0a447d6468d505f6323656f957dc954f913

[WPPG] Separate files of overriding for building different variant

We moved the files in ThemePicker that are NOT shared with WPPG to
another folder.

Bug: 239542256
Test: Tested wallpaperpicker2Debug, themepickerDebug and googleDebug
could build

Change-Id: Ie90fcc0d614b10928bc948c03decc0d83d47f80e

Android.bp

diff --git a/Android.bp b/Android.bp
index c85fd2b..5b16e07 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,7 +54,7 @@
     name: "ThemePicker_res",
     tools: ["soong_zip"],
     srcs: [
-        "res/**/*"
+        "res/**/*",
     ],
     out: ["ThemePicker_res.zip"],
     cmd: "INPUTS=($(in)) && "
@@ -89,6 +89,10 @@
         "src_override/**/*.kt",
     ],
 
+    resource_dirs: [
+        "res_override",
+    ],
+
     use_embedded_native_libs: true,
 
     resource_zips: [":WallpaperPicker2_res", ":ThemePicker_res"],