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/Android.bp

diff --git a/tests/UpdatableSystemFontTest/Android.bp b/tests/UpdatableSystemFontTest/Android.bp
index d4f1ad3..8b0ae5c 100644
--- a/tests/UpdatableSystemFontTest/Android.bp
+++ b/tests/UpdatableSystemFontTest/Android.bp
@@ -24,18 +24,27 @@
 java_test_host {
     name: "UpdatableSystemFontTest",
     srcs: ["src/**/*.java"],
-    libs: ["tradefed", "compatibility-tradefed", "compatibility-host-util"],
+    libs: [
+        "tradefed",
+        "compatibility-tradefed",
+        "compatibility-host-util",
+    ],
     static_libs: [
         "frameworks-base-hostutils",
     ],
-    test_suites: ["general-tests", "vts"],
+    test_suites: [
+        "general-tests",
+        "vts",
+    ],
     data: [
         ":NotoColorEmojiTtf",
         ":UpdatableSystemFontTestCertDer",
         ":UpdatableSystemFontTestNotoColorEmojiTtfFsvSig",
-        ":UpdatableSystemFontTestNotoColorEmojiV1Ttf",
-        ":UpdatableSystemFontTestNotoColorEmojiV1TtfFsvSig",
-        ":UpdatableSystemFontTestNotoColorEmojiV2Ttf",
-        ":UpdatableSystemFontTestNotoColorEmojiV2TtfFsvSig",
+        ":UpdatableSystemFontTestNotoColorEmojiV0Ttf",
+        ":UpdatableSystemFontTestNotoColorEmojiV0TtfFsvSig",
+        ":UpdatableSystemFontTestNotoColorEmojiVPlus1Ttf",
+        ":UpdatableSystemFontTestNotoColorEmojiVPlus1TtfFsvSig",
+        ":UpdatableSystemFontTestNotoColorEmojiVPlus2Ttf",
+        ":UpdatableSystemFontTestNotoColorEmojiVPlus2TtfFsvSig",
     ],
 }