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

Commit 51ffcae5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename go/src_flags directory as go/src" into ub-launcher3-master

parents 25c05397 c00a2597

Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib 
LOCAL_SRC_FILES := \

    $(call all-java-files-under, src) \

    $(call all-java-files-under, src_ui_overrides) \

    $(call all-java-files-under, go/src_flags)

    $(call all-java-files-under, go/src)



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/go/res
@@ -235,7 +235,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib 
LOCAL_SRC_FILES := \

    $(call all-java-files-under, src) \

    $(call all-java-files-under, quickstep/src) \

    $(call all-java-files-under, go/src_flags)

    $(call all-java-files-under, go/src)



LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/quickstep/res \

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ android { 


        l3go {

            res.srcDirs = ['go/res']

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

            java.srcDirs = ['go/src', "src_ui_overrides"]

            manifest.srcFile "go/AndroidManifest.xml"

        }