From a084a4bf7c8fe821fad42f617bfb67b207ed9546 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Tue, 11 Jul 2023 23:22:52 +0100
Subject: [PATCH] Use new `metalava signature-to-jdiff` sub-command
Also, removes `--no-banner` as it is deprecated and `--format=v2` is
unnecessary.
Bug: 290825755
Test: m current-api-xml
(cherry picked from https://android-review.googlesource.com/q/commit:aab881d8b7ebea74266039275d0f5bf7019e1a5b)
Merged-In: Ib2ff55cf2bfd2128866b2e4f67cf39303135b79b
Change-Id: Ib2ff55cf2bfd2128866b2e4f67cf39303135b79b
Bug: 299428102
---
api/Android.bp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/api/Android.bp b/api/Android.bp
index f5bafe8bf8dae..c16bce5a1aea1 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -60,14 +60,14 @@ python_test_host {
metalava_cmd = "$(location metalava)"
// Silence reflection warnings. See b/168689341
metalava_cmd += " -J--add-opens=java.base/java.util=ALL-UNNAMED "
-metalava_cmd += " --quiet --no-banner --format=v2 "
+metalava_cmd += " --quiet "
genrule {
name: "current-api-xml",
tools: ["metalava"],
srcs: [":frameworks-base-api-current.txt"],
out: ["current.api"],
- cmd: metalava_cmd + "-convert2xmlnostrip $(in) $(out)",
+ cmd: metalava_cmd + "signature-to-jdiff $(in) $(out)",
visibility: ["//visibility:public"],
}
--
GitLab