1 files changed, 14 insertions, 3 deletions
diff --git a/tools/aconfig/convert_finalized_flags/Android.bp b/tools/aconfig/convert_finalized_flags/Android.bp
index 9ace80597a..0acc15bede 100644
--- a/tools/aconfig/convert_finalized_flags/Android.bp
+++ b/tools/aconfig/convert_finalized_flags/Android.bp
@@ -14,9 +14,12 @@ rust_defaults {
         "libprotobuf",
         "libserde",
         "libserde_json",
-        "libtempfile",
         "libtinytemplate",
     ],
+    features: select(release_flag("RELEASE_ACONFIG_SUPPORT_MINOR_SDK"), {
+        true: ["support_minor_sdk"],
+        default: [],
+    }),
 }
 
 rust_library_host {
@@ -43,6 +46,9 @@ rust_test_host {
     defaults: ["convert_finalized_flags.defaults"],
     test_suites: ["general-tests"],
     srcs: ["src/lib.rs"],
+    rustlibs: [
+        "libtempfile",
+    ],
 }
 
 genrule {
@@ -50,11 +56,16 @@ genrule {
     srcs: [
         "//prebuilts/sdk:finalized-api-flags",
     ],
-    tool_files: ["extended_flags_list_35.txt"],
+    tool_files: [
+        "sdk/35/extended_flags_list.txt",
+        "sdk/36/extended_flags_list.txt",
+    ],
     out: ["finalized_flags_record.json"],
     tools: ["convert_finalized_flags"],
     cmd: "args=\"\" && " +
         "for f in $(locations //prebuilts/sdk:finalized-api-flags); " +
         " do args=\"$$args --flag_file_path $$f\"; done && " +
-        "$(location convert_finalized_flags) $$args  --extended-flag-file-path $(location extended_flags_list_35.txt) > $(out)",
+        "$(location convert_finalized_flags) $$args " +
+        "  --flag_file_path $(location sdk/35/extended_flags_list.txt) " +
+        "  --flag_file_path $(location sdk/36/extended_flags_list.txt) > $(out)",
 }