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

Commit 48acf101 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Add genrule for combined-removed-dex" am: b0ba7618 am: dd7eb2b0 am:... 

Merge "Add genrule for combined-removed-dex" am: b0ba7618 am: dd7eb2b0 am: a07b8d4e am: c6cb7e9b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446678

Change-Id: I2548dbfdc44faea3da2bc07290ee28fba9882d6f
parents 75c38574 c6cb7e9b

api/Android.bp

+14 −0
Original line number Diff line number Diff line
@@ -150,3 +150,17 @@ genrule { 
    tools: ["metalava"],

    cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",

}



genrule {

    name: "combined-removed-dex",

    srcs: [

        ":frameworks-base-api-removed-merged.txt",

        ":frameworks-base-api-system-removed-merged.txt",

        ":android.car-stubs-docs{.removed-api.txt}",

        ":android.car-system-stubs-docs{.removed-api.txt}",

    ],

    tool_files: ["gen_combined_removed_dex.sh"],

    tools: ["metalava"],

    out: ["combined-removed-dex.txt"],

    cmd: "$(location gen_combined_removed_dex.sh) $(location metalava) $(genDir) $(in) > $(out)",

}

api/gen_combined_removed_dex.sh

0 → 100755
+11 −0
Original line number Diff line number Diff line 
#!/bin/bash



metalava_path="$1"

tmp_dir="$2"

shift 2



# Convert each removed.txt to the "dex format" equivalent, and print all output.

for f in "$@"; do

    "$metalava_path" --no-banner "$f" --dex-api "${tmp_dir}/tmp"

    cat "${tmp_dir}/tmp"

done