commit 221f23e05fe577beac1d174e5541168d6b916704
author Vignesh Venkatasubramanian <vigneshv@google.com> Tue Mar 18 16:44:44 2025 +0000
committer Vignesh Venkatasubramanian <vigneshv@google.com> Tue Mar 18 16:48:18 2025 +0000
tree 39fe3dc174878557912033c773ac921d404d6b39
parent b08656d6e9f645a28ae3c778f2410e2f2d1e646b

Android.bp: Make sure lib.rs always appears first

Recently [1], external_updater started to run bpfmt -s which sorts
all the lists. For rust srcs, lib.rs always has to appear as the
first entry in th sources list. Add a comment between that and
other input sources so that it will never be sorted by bpfmt -s.

Also run bpfmt -s to sort everything else so that external_updater
diff are minimal.

[1] http://aosp/3501973

Test: Treehugger
Change-Id: Iae7b37a5698b58b53e888d56d5471e916225727d

Android.bp

diff --git a/Android.bp b/Android.bp
index 76fda3b..4db5ebb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,9 +20,9 @@
     ],
     bindgen_flags: [
         "--allowlist-item=android::MediaImage2?",
-        "--no-recursive-allowlist",
-        "--no-layout-tests",
         "--no-doc-comments",
+        "--no-layout-tests",
+        "--no-recursive-allowlist",
     ],
 }
 
@@ -47,6 +47,8 @@
     cfgs: ["android_soong"],
     srcs: [
         "sys/ndk-sys/src/lib.rs",
+        // This comment prevents bpfmt -s from sorting this list as lib.rs
+        // always has to be the first in the source list.
         ":libcrabbyavif_ndk_bindgen",
     ],
     shared_libs: [
@@ -74,14 +76,16 @@
     cfgs: ["android_soong"],
     srcs: [
         "sys/libyuv-sys/src/lib.rs",
+        // This comment prevents bpfmt -s from sorting this list as lib.rs
+        // always has to be the first in the source list.
         ":libcrabbyavif_yuv_bindgen",
     ],
     whole_static_libs: [
         "libyuv",
     ],
     shared_libs: [
-        "libjpeg",
         "libc++",
+        "libjpeg",
     ],
 }
 
@@ -92,20 +96,22 @@
     cargo_pkg_version: "0.1.0",
     srcs: [
         "src/lib.rs",
+        // This comment prevents bpfmt -s from sorting this list as lib.rs
+        // always has to be the first in the source list.
         ":libcrabbyavif_mediaimage2_bindgen",
     ],
     cfgs: ["android_soong"],
     edition: "2021",
     features: [
         "android_mediacodec",
-        "libyuv",
         "capi",
         "heic",
+        "libyuv",
     ],
     rustlibs: [
-        "liblogger",
-        "liblog_rust",
         "liblibyuv_sys",
+        "liblog_rust",
+        "liblogger",
         "libndk_sys",
         "librustutils",
     ],
@@ -114,7 +120,7 @@
     ],
     include_dirs: ["include"],
     apex_available: [
-        "//apex_available:platform",
         "//apex_available:anyapex",
+        "//apex_available:platform",
     ],
 }