Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eea6ab9c authored by Kevin's avatar Kevin
Browse files

Fix Launcher3 gradle src_shorcuts_overrides issue. 

This fixes an issue with l3go variant not building due to duplicate
classes. This ensures that l3go does not pull the
src_shortcuts_overrides src as it overrides it.

Test: Build APK for l3go variant in IDE
Change-Id: Id2b10035b30eaf8f677913c85e384569ecc78359
parent efb8b836

build.gradle

+3 −3
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ android { 
    sourceSets {

        main {

            res.srcDirs = ['res']

            java.srcDirs = ['src', 'src_shortcuts_overrides']

            java.srcDirs = ['src']

            manifest.srcFile 'AndroidManifest-common.xml'

            proto {

                srcDir 'protos/'
@@ -93,7 +93,7 @@ android { 
        }



        aosp {

            java.srcDirs = ['src_flags', "src_ui_overrides"]

            java.srcDirs = ['src_flags', "src_ui_overrides", 'src_shortcuts_overrides']

        }



        l3go {
@@ -104,7 +104,7 @@ android { 


        quickstep {

            res.srcDirs = ['quickstep/res']

            java.srcDirs = ['src_flags', 'quickstep/src']

            java.srcDirs = ['src_flags', 'quickstep/src', 'src_shortcuts_overrides']

            manifest.srcFile "quickstep/AndroidManifest.xml"

        }

    }