commit bd636d839155abf3b3d2114f096105bc5f70f5df
author Kohsuke Yatoh <kyatoh@google.com> Thu Apr 08 12:54:29 2021 -0700
committer Kohsuke Yatoh <kyatoh@google.com> Thu Apr 08 12:58:57 2021 -0700
tree afa4d1f0af97421767704465145b6a13efcea9a0
parent 4a50c4e8470fa7677731c1ddb4839f4009ee3d44

Allow same version update.

Bug: 184862662
Test: atest FrameworksServicesTests:UpdatableFontDirTest
Test: atest UpdatableSystemFontTest
Change-Id: Ic955e2713c08e4c258d61cd3b597a472e1e3298c

tests/UpdatableSystemFontTest/testdata/Android.bp

diff --git a/tests/UpdatableSystemFontTest/testdata/Android.bp b/tests/UpdatableSystemFontTest/testdata/Android.bp
index f744d5d..0f01be0 100644
--- a/tests/UpdatableSystemFontTest/testdata/Android.bp
+++ b/tests/UpdatableSystemFontTest/testdata/Android.bp
@@ -38,6 +38,23 @@
 
 genrule_defaults {
     name: "updatable_system_font_increment_font_revision_default",
+}
+
+genrule {
+    name: "UpdatableSystemFontTestNotoColorEmojiV0Ttf",
+    srcs: [":NotoColorEmojiTtf"],
+    out: ["UpdatableSystemFontTestNotoColorEmojiV0.ttf"],
+    tools: ["update_font_metadata"],
+    cmd: "$(location update_font_metadata) " +
+        "--input=$(in) " +
+        "--output=$(out) " +
+        "--revision=0",
+}
+
+genrule {
+    name: "UpdatableSystemFontTestNotoColorEmojiVPlus1Ttf",
+    srcs: [":NotoColorEmojiTtf"],
+    out: ["UpdatableSystemFontTestNotoColorEmojiVPlus1.ttf"],
     tools: ["update_font_metadata"],
     cmd: "$(location update_font_metadata) " +
         "--input=$(in) " +
@@ -46,23 +63,23 @@
 }
 
 genrule {
-    name: "UpdatableSystemFontTestNotoColorEmojiV1Ttf",
-    defaults: ["updatable_system_font_increment_font_revision_default"],
+    name: "UpdatableSystemFontTestNotoColorEmojiVPlus2Ttf",
     srcs: [":NotoColorEmojiTtf"],
-    out: ["UpdatableSystemFontTestNotoColorEmojiV1.ttf"],
-}
-
-genrule {
-    name: "UpdatableSystemFontTestNotoColorEmojiV2Ttf",
-    defaults: ["updatable_system_font_increment_font_revision_default"],
-    srcs: [":UpdatableSystemFontTestNotoColorEmojiV1Ttf"],
-    out: ["UpdatableSystemFontTestNotoColorEmojiV2.ttf"],
+    out: ["UpdatableSystemFontTestNotoColorEmojiVPlus2.ttf"],
+    tools: ["update_font_metadata"],
+    cmd: "$(location update_font_metadata) " +
+        "--input=$(in) " +
+        "--output=$(out) " +
+        "--revision=+2",
 }
 
 genrule_defaults {
     name: "updatable_system_font_sig_gen_default",
     tools: ["fsverity"],
-    tool_files: [":UpdatableSystemFontTestKeyPem", ":UpdatableSystemFontTestCertPem"],
+    tool_files: [
+        ":UpdatableSystemFontTestKeyPem",
+        ":UpdatableSystemFontTestCertPem",
+    ],
     cmd: "$(location fsverity) sign $(in) $(out) " +
         "--key=$(location :UpdatableSystemFontTestKeyPem) " +
         "--cert=$(location :UpdatableSystemFontTestCertPem) " +
@@ -77,15 +94,22 @@
 }
 
 genrule {
-    name: "UpdatableSystemFontTestNotoColorEmojiV1TtfFsvSig",
+    name: "UpdatableSystemFontTestNotoColorEmojiV0TtfFsvSig",
     defaults: ["updatable_system_font_sig_gen_default"],
-    srcs: [":UpdatableSystemFontTestNotoColorEmojiV1Ttf"],
-    out: ["UpdatableSystemFontTestNotoColorEmojiV1.ttf.fsv_sig"],
+    srcs: [":UpdatableSystemFontTestNotoColorEmojiV0Ttf"],
+    out: ["UpdatableSystemFontTestNotoColorEmojiV0.ttf.fsv_sig"],
 }
 
 genrule {
-    name: "UpdatableSystemFontTestNotoColorEmojiV2TtfFsvSig",
+    name: "UpdatableSystemFontTestNotoColorEmojiVPlus1TtfFsvSig",
     defaults: ["updatable_system_font_sig_gen_default"],
-    srcs: [":UpdatableSystemFontTestNotoColorEmojiV2Ttf"],
-    out: ["UpdatableSystemFontTestNotoColorEmojiV2.ttf.fsv_sig"],
+    srcs: [":UpdatableSystemFontTestNotoColorEmojiVPlus1Ttf"],
+    out: ["UpdatableSystemFontTestNotoColorEmojiVPlus1.ttf.fsv_sig"],
+}
+
+genrule {
+    name: "UpdatableSystemFontTestNotoColorEmojiVPlus2TtfFsvSig",
+    defaults: ["updatable_system_font_sig_gen_default"],
+    srcs: [":UpdatableSystemFontTestNotoColorEmojiVPlus2Ttf"],
+    out: ["UpdatableSystemFontTestNotoColorEmojiVPlus2.ttf.fsv_sig"],
 }