From 4fbcf2f910db111b7c2aee8bb1273f4fc32ba976 Mon Sep 17 00:00:00 2001 From: Lajos Molnar Date: Wed, 17 Jan 2024 09:59:01 -0800 Subject: order dependendencies in AconfigFlags.bp This will help minimize merge conflicts down the line Bug: 289097671 Change-Id: I005714dcf7be28d64e9d131b46d86c857ee4231d Merged-in: I005714dcf7be28d64e9d131b46d86c857ee4231d --- AconfigFlags.bp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/AconfigFlags.bp b/AconfigFlags.bp index 27eb9bc59853..bd693850f45e 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -13,6 +13,8 @@ // limitations under the License. aconfig_srcjars = [ + // !!! KEEP THIS LIST ALPHABETICAL !!! + ":aconfig_mediacodec_flags_java_lib{.generated_srcjars}", ":android.content.pm.flags-aconfig-java{.generated_srcjars}", ":android.content.res.flags-aconfig-java{.generated_srcjars}", ":android.hardware.biometrics.flags-aconfig-java{.generated_srcjars}", @@ -21,11 +23,11 @@ aconfig_srcjars = [ ":android.os.flags-aconfig-java{.generated_srcjars}", ":android.security.flags-aconfig-java{.generated_srcjars}", ":com.android.hardware.camera2-aconfig-java{.generated_srcjars}", - ":com.android.window.flags.window-aconfig-java{.generated_srcjars}", ":com.android.hardware.input-aconfig-java{.generated_srcjars}", - ":com.android.text.flags-aconfig-java{.generated_srcjars}", ":com.android.net.flags-aconfig-java{.generated_srcjars}", - ":aconfig_mediacodec_flags_java_lib{.generated_srcjars}", + ":com.android.text.flags-aconfig-java{.generated_srcjars}", + ":com.android.window.flags.window-aconfig-java{.generated_srcjars}", + // !!! KEEP THIS LIST ALPHABETICAL !!! ] filegroup { -- cgit v1.2.3-59-g8ed1b