From c00a25970173681efe12377d67d858f37f30a1b4 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Tue, 30 Oct 2018 17:16:25 -0700 Subject: [PATCH] Rename go/src_flags directory as go/src This CL is preparation work to implement Modular shortcuts component in launcher using java/code swap. Bug: 112904271 Test: Manual test Change-Id: I35cf81e95fe487a384d4e9f17ea303093197318f --- Android.mk | 4 ++-- build.gradle | 2 +- .../com/android/launcher3/config/FeatureFlags.java | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename go/{src_flags => src}/com/android/launcher3/config/FeatureFlags.java (100%) diff --git a/Android.mk b/Android.mk index fbe19b0b63..ba820fb7d5 100644 --- a/Android.mk +++ b/Android.mk @@ -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 \ diff --git a/build.gradle b/build.gradle index 1b9df53d6a..affd85379d 100644 --- a/build.gradle +++ b/build.gradle @@ -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" } diff --git a/go/src_flags/com/android/launcher3/config/FeatureFlags.java b/go/src/com/android/launcher3/config/FeatureFlags.java similarity index 100% rename from go/src_flags/com/android/launcher3/config/FeatureFlags.java rename to go/src/com/android/launcher3/config/FeatureFlags.java