Merge "Snap for 11703238 from 61449a7b7148cdfc6296dfa86ba2933ee11b4143 to androidx-annotation-release" into androidx-annotation-releaseandroidx-annotation-release

5 files changed, 241 insertions, 1 deletions

diff --git a/emoji-compat-flatbuffers/Android.mk b/emoji-compat-flatbuffers/Android.mk
index 76bd918..a022aba 100644
--- a/emoji-compat-flatbuffers/Android.mk
+++ b/emoji-compat-flatbuffers/Android.mk
@@ -23,6 +23,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     flatbuffers-java
 
 LOCAL_JAR_EXCLUDE_FILES := none
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
+LOCAL_JAVA_LANGUAGE_VERSION := 1.8
 LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
 include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/emoji-compat-flatbuffers/build.gradle b/emoji-compat-flatbuffers/build.gradle
index 3d9d8cb..25b3cb6 100644
--- a/emoji-compat-flatbuffers/build.gradle
+++ b/emoji-compat-flatbuffers/build.gradle
@@ -28,6 +28,10 @@ compileJava {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
+project.tasks.withType(JavaCompile).configureEach { task ->
+    // JDK 21 considers Java 8 an obsolete source and target value. Disable this warning.
+    task.options.compilerArgs.add("-Xlint:-options")
+}
 
 dependencies {
     implementation("com.google.flatbuffers:flatbuffers-java:1.12.0")
diff --git a/emoji-compat/data/emoji_metadata.txt b/emoji-compat/data/emoji_metadata.txt
index 6a9110e..0f4043d 100644
--- a/emoji-compat/data/emoji_metadata.txt
+++ b/emoji-compat/data/emoji_metadata.txt
@@ -3716,3 +3716,121 @@ F0EB7 1500 9 1FAF8 1F3FC
 F0EB8 1500 9 1FAF8 1F3FD

 F0EB9 1500 9 1FAF8 1F3FE

 F0EBA 1500 9 1FAF8 1F3FF

+F0EBC 1510 10 26D3 200D 1F4A5

+F0EBD 1510 10 1F344 200D 1F7EB

+F0EBE 1510 10 1F34B 200D 1F7E9

+F0EBF 1510 10 1F3C3 200D 2640 200D 27A1

+F0EC0 1510 10 1F3C3 200D 2642 200D 27A1

+F0EC1 1510 10 1F3C3 200D 27A1

+F0EC2 1510 10 1F3C3 1F3FB 200D 2640 200D 27A1

+F0EC3 1510 10 1F3C3 1F3FB 200D 2642 200D 27A1

+F0EC4 1510 10 1F3C3 1F3FB 200D 27A1

+F0EC5 1510 10 1F3C3 1F3FC 200D 2640 200D 27A1

+F0EC6 1510 10 1F3C3 1F3FC 200D 2642 200D 27A1

+F0EC7 1510 10 1F3C3 1F3FC 200D 27A1

+F0EC8 1510 10 1F3C3 1F3FD 200D 2640 200D 27A1

+F0EC9 1510 10 1F3C3 1F3FD 200D 2642 200D 27A1

+F0ECA 1510 10 1F3C3 1F3FD 200D 27A1

+F0ECB 1510 10 1F3C3 1F3FE 200D 2640 200D 27A1

+F0ECC 1510 10 1F3C3 1F3FE 200D 2642 200D 27A1

+F0ECD 1510 10 1F3C3 1F3FE 200D 27A1

+F0ECE 1510 10 1F3C3 1F3FF 200D 2640 200D 27A1

+F0ECF 1510 10 1F3C3 1F3FF 200D 2642 200D 27A1

+F0ED0 1510 10 1F3C3 1F3FF 200D 27A1

+F0ED1 1510 10 1F426 200D 1F525

+F0ED2 1510 10 1F468 200D 1F9AF 200D 27A1

+F0ED3 1510 10 1F468 200D 1F9BC 200D 27A1

+F0ED4 1510 10 1F468 200D 1F9BD 200D 27A1

+F0ED5 1510 10 1F468 1F3FB 200D 1F9AF 200D 27A1

+F0ED6 1510 10 1F468 1F3FB 200D 1F9BC 200D 27A1

+F0ED7 1510 10 1F468 1F3FB 200D 1F9BD 200D 27A1

+F0ED8 1510 10 1F468 1F3FC 200D 1F9AF 200D 27A1

+F0ED9 1510 10 1F468 1F3FC 200D 1F9BC 200D 27A1

+F0EDA 1510 10 1F468 1F3FC 200D 1F9BD 200D 27A1

+F0EDB 1510 10 1F468 1F3FD 200D 1F9AF 200D 27A1

+F0EDC 1510 10 1F468 1F3FD 200D 1F9BC 200D 27A1

+F0EDD 1510 10 1F468 1F3FD 200D 1F9BD 200D 27A1

+F0EDE 1510 10 1F468 1F3FE 200D 1F9AF 200D 27A1

+F0EDF 1510 10 1F468 1F3FE 200D 1F9BC 200D 27A1

+F0EE0 1510 10 1F468 1F3FE 200D 1F9BD 200D 27A1

+F0EE1 1510 10 1F468 1F3FF 200D 1F9AF 200D 27A1

+F0EE2 1510 10 1F468 1F3FF 200D 1F9BC 200D 27A1

+F0EE3 1510 10 1F468 1F3FF 200D 1F9BD 200D 27A1

+F0EE4 1510 10 1F469 200D 1F9AF 200D 27A1

+F0EE5 1510 10 1F469 200D 1F9BC 200D 27A1

+F0EE6 1510 10 1F469 200D 1F9BD 200D 27A1

+F0EE7 1510 10 1F469 1F3FB 200D 1F9AF 200D 27A1

+F0EE8 1510 10 1F469 1F3FB 200D 1F9BC 200D 27A1

+F0EE9 1510 10 1F469 1F3FB 200D 1F9BD 200D 27A1

+F0EEA 1510 10 1F469 1F3FC 200D 1F9AF 200D 27A1

+F0EEB 1510 10 1F469 1F3FC 200D 1F9BC 200D 27A1

+F0EEC 1510 10 1F469 1F3FC 200D 1F9BD 200D 27A1

+F0EED 1510 10 1F469 1F3FD 200D 1F9AF 200D 27A1

+F0EEE 1510 10 1F469 1F3FD 200D 1F9BC 200D 27A1

+F0EEF 1510 10 1F469 1F3FD 200D 1F9BD 200D 27A1

+F0EF0 1510 10 1F469 1F3FE 200D 1F9AF 200D 27A1

+F0EF1 1510 10 1F469 1F3FE 200D 1F9BC 200D 27A1

+F0EF2 1510 10 1F469 1F3FE 200D 1F9BD 200D 27A1

+F0EF3 1510 10 1F469 1F3FF 200D 1F9AF 200D 27A1

+F0EF4 1510 10 1F469 1F3FF 200D 1F9BC 200D 27A1

+F0EF5 1510 10 1F469 1F3FF 200D 1F9BD 200D 27A1

+F0EF6 1510 10 1F642 200D 2194

+F0EF7 1510 10 1F642 200D 2195

+F0EF8 1510 10 1F6B6 200D 2640 200D 27A1

+F0EF9 1510 10 1F6B6 200D 2642 200D 27A1

+F0EFA 1510 10 1F6B6 200D 27A1

+F0EFB 1510 10 1F6B6 1F3FB 200D 2640 200D 27A1

+F0EFC 1510 10 1F6B6 1F3FB 200D 2642 200D 27A1

+F0EFD 1510 10 1F6B6 1F3FB 200D 27A1

+F0EFE 1510 10 1F6B6 1F3FC 200D 2640 200D 27A1

+F0EFF 1510 10 1F6B6 1F3FC 200D 2642 200D 27A1

+F0F00 1510 10 1F6B6 1F3FC 200D 27A1

+F0F01 1510 10 1F6B6 1F3FD 200D 2640 200D 27A1

+F0F02 1510 10 1F6B6 1F3FD 200D 2642 200D 27A1

+F0F03 1510 10 1F6B6 1F3FD 200D 27A1

+F0F04 1510 10 1F6B6 1F3FE 200D 2640 200D 27A1

+F0F05 1510 10 1F6B6 1F3FE 200D 2642 200D 27A1

+F0F06 1510 10 1F6B6 1F3FE 200D 27A1

+F0F07 1510 10 1F6B6 1F3FF 200D 2640 200D 27A1

+F0F08 1510 10 1F6B6 1F3FF 200D 2642 200D 27A1

+F0F09 1510 10 1F6B6 1F3FF 200D 27A1

+F0F0A 1510 10 1F9CE 200D 2640 200D 27A1

+F0F0B 1510 10 1F9CE 200D 2642 200D 27A1

+F0F0C 1510 10 1F9CE 200D 27A1

+F0F0D 1510 10 1F9CE 1F3FB 200D 2640 200D 27A1

+F0F0E 1510 10 1F9CE 1F3FB 200D 2642 200D 27A1

+F0F0F 1510 10 1F9CE 1F3FB 200D 27A1

+F0F10 1510 10 1F9CE 1F3FC 200D 2640 200D 27A1

+F0F11 1510 10 1F9CE 1F3FC 200D 2642 200D 27A1

+F0F12 1510 10 1F9CE 1F3FC 200D 27A1

+F0F13 1510 10 1F9CE 1F3FD 200D 2640 200D 27A1

+F0F14 1510 10 1F9CE 1F3FD 200D 2642 200D 27A1

+F0F15 1510 10 1F9CE 1F3FD 200D 27A1

+F0F16 1510 10 1F9CE 1F3FE 200D 2640 200D 27A1

+F0F17 1510 10 1F9CE 1F3FE 200D 2642 200D 27A1

+F0F18 1510 10 1F9CE 1F3FE 200D 27A1

+F0F19 1510 10 1F9CE 1F3FF 200D 2640 200D 27A1

+F0F1A 1510 10 1F9CE 1F3FF 200D 2642 200D 27A1

+F0F1B 1510 10 1F9CE 1F3FF 200D 27A1

+F0F1C 1510 10 1F9D1 200D 1F9AF 200D 27A1

+F0F1D 1510 10 1F9D1 200D 1F9BC 200D 27A1

+F0F1E 1510 10 1F9D1 200D 1F9BD 200D 27A1

+F0F1F 1510 10 1F9D1 200D 1F9D1 200D 1F9D2

+F0F20 1510 10 1F9D1 200D 1F9D1 200D 1F9D2 200D 1F9D2

+F0F21 1510 10 1F9D1 200D 1F9D2

+F0F22 1510 10 1F9D1 200D 1F9D2 200D 1F9D2

+F0F23 1510 10 1F9D1 1F3FB 200D 1F9AF 200D 27A1

+F0F24 1510 10 1F9D1 1F3FB 200D 1F9BC 200D 27A1

+F0F25 1510 10 1F9D1 1F3FB 200D 1F9BD 200D 27A1

+F0F26 1510 10 1F9D1 1F3FC 200D 1F9AF 200D 27A1

+F0F27 1510 10 1F9D1 1F3FC 200D 1F9BC 200D 27A1

+F0F28 1510 10 1F9D1 1F3FC 200D 1F9BD 200D 27A1

+F0F29 1510 10 1F9D1 1F3FD 200D 1F9AF 200D 27A1

+F0F2A 1510 10 1F9D1 1F3FD 200D 1F9BC 200D 27A1

+F0F2B 1510 10 1F9D1 1F3FD 200D 1F9BD 200D 27A1

+F0F2C 1510 10 1F9D1 1F3FE 200D 1F9AF 200D 27A1

+F0F2D 1510 10 1F9D1 1F3FE 200D 1F9BC 200D 27A1

+F0F2E 1510 10 1F9D1 1F3FE 200D 1F9BD 200D 27A1

+F0F2F 1510 10 1F9D1 1F3FF 200D 1F9AF 200D 27A1

+F0F30 1510 10 1F9D1 1F3FF 200D 1F9BC 200D 27A1

+F0F31 1510 10 1F9D1 1F3FF 200D 1F9BD 200D 27A1

diff --git a/emoji-compat/font/NotoColorEmojiCompat.ttf b/emoji-compat/font/NotoColorEmojiCompat.ttf
index c48cd26..faf337e 100644
--- a/emoji-compat/font/NotoColorEmojiCompat.ttf
+++ b/emoji-compat/font/NotoColorEmojiCompat.ttf
diff --git a/emoji-compat/supported-emojis/emojis.txt b/emoji-compat/supported-emojis/emojis.txt
index 3e5eb9e..2e9c804 100644
--- a/emoji-compat/supported-emojis/emojis.txt
+++ b/emoji-compat/supported-emojis/emojis.txt
@@ -3862,3 +3862,121 @@ AE FE0F
 1FAF8 1F3FD
 1FAF8 1F3FE
 1FAF8 1F3FF
+26D3 200D 1F4A5
+1F344 200D 1F7EB
+1F34B 200D 1F7E9
+1F3C3 200D 2640 200D 27A1
+1F3C3 200D 2642 200D 27A1
+1F3C3 200D 27A1
+1F3C3 1F3FB 200D 2640 200D 27A1
+1F3C3 1F3FB 200D 2642 200D 27A1
+1F3C3 1F3FB 200D 27A1
+1F3C3 1F3FC 200D 2640 200D 27A1
+1F3C3 1F3FC 200D 2642 200D 27A1
+1F3C3 1F3FC 200D 27A1
+1F3C3 1F3FD 200D 2640 200D 27A1
+1F3C3 1F3FD 200D 2642 200D 27A1
+1F3C3 1F3FD 200D 27A1
+1F3C3 1F3FE 200D 2640 200D 27A1
+1F3C3 1F3FE 200D 2642 200D 27A1
+1F3C3 1F3FE 200D 27A1
+1F3C3 1F3FF 200D 2640 200D 27A1
+1F3C3 1F3FF 200D 2642 200D 27A1
+1F3C3 1F3FF 200D 27A1
+1F426 200D 1F525
+1F468 200D 1F9AF 200D 27A1
+1F468 200D 1F9BC 200D 27A1
+1F468 200D 1F9BD 200D 27A1
+1F468 1F3FB 200D 1F9AF 200D 27A1
+1F468 1F3FB 200D 1F9BC 200D 27A1
+1F468 1F3FB 200D 1F9BD 200D 27A1
+1F468 1F3FC 200D 1F9AF 200D 27A1
+1F468 1F3FC 200D 1F9BC 200D 27A1
+1F468 1F3FC 200D 1F9BD 200D 27A1
+1F468 1F3FD 200D 1F9AF 200D 27A1
+1F468 1F3FD 200D 1F9BC 200D 27A1
+1F468 1F3FD 200D 1F9BD 200D 27A1
+1F468 1F3FE 200D 1F9AF 200D 27A1
+1F468 1F3FE 200D 1F9BC 200D 27A1
+1F468 1F3FE 200D 1F9BD 200D 27A1
+1F468 1F3FF 200D 1F9AF 200D 27A1
+1F468 1F3FF 200D 1F9BC 200D 27A1
+1F468 1F3FF 200D 1F9BD 200D 27A1
+1F469 200D 1F9AF 200D 27A1
+1F469 200D 1F9BC 200D 27A1
+1F469 200D 1F9BD 200D 27A1
+1F469 1F3FB 200D 1F9AF 200D 27A1
+1F469 1F3FB 200D 1F9BC 200D 27A1
+1F469 1F3FB 200D 1F9BD 200D 27A1
+1F469 1F3FC 200D 1F9AF 200D 27A1
+1F469 1F3FC 200D 1F9BC 200D 27A1
+1F469 1F3FC 200D 1F9BD 200D 27A1
+1F469 1F3FD 200D 1F9AF 200D 27A1
+1F469 1F3FD 200D 1F9BC 200D 27A1
+1F469 1F3FD 200D 1F9BD 200D 27A1
+1F469 1F3FE 200D 1F9AF 200D 27A1
+1F469 1F3FE 200D 1F9BC 200D 27A1
+1F469 1F3FE 200D 1F9BD 200D 27A1
+1F469 1F3FF 200D 1F9AF 200D 27A1
+1F469 1F3FF 200D 1F9BC 200D 27A1
+1F469 1F3FF 200D 1F9BD 200D 27A1
+1F642 200D 2194
+1F642 200D 2195
+1F6B6 200D 2640 200D 27A1
+1F6B6 200D 2642 200D 27A1
+1F6B6 200D 27A1
+1F6B6 1F3FB 200D 2640 200D 27A1
+1F6B6 1F3FB 200D 2642 200D 27A1
+1F6B6 1F3FB 200D 27A1
+1F6B6 1F3FC 200D 2640 200D 27A1
+1F6B6 1F3FC 200D 2642 200D 27A1
+1F6B6 1F3FC 200D 27A1
+1F6B6 1F3FD 200D 2640 200D 27A1
+1F6B6 1F3FD 200D 2642 200D 27A1
+1F6B6 1F3FD 200D 27A1
+1F6B6 1F3FE 200D 2640 200D 27A1
+1F6B6 1F3FE 200D 2642 200D 27A1
+1F6B6 1F3FE 200D 27A1
+1F6B6 1F3FF 200D 2640 200D 27A1
+1F6B6 1F3FF 200D 2642 200D 27A1
+1F6B6 1F3FF 200D 27A1
+1F9CE 200D 2640 200D 27A1
+1F9CE 200D 2642 200D 27A1
+1F9CE 200D 27A1
+1F9CE 1F3FB 200D 2640 200D 27A1
+1F9CE 1F3FB 200D 2642 200D 27A1
+1F9CE 1F3FB 200D 27A1
+1F9CE 1F3FC 200D 2640 200D 27A1
+1F9CE 1F3FC 200D 2642 200D 27A1
+1F9CE 1F3FC 200D 27A1
+1F9CE 1F3FD 200D 2640 200D 27A1
+1F9CE 1F3FD 200D 2642 200D 27A1
+1F9CE 1F3FD 200D 27A1
+1F9CE 1F3FE 200D 2640 200D 27A1
+1F9CE 1F3FE 200D 2642 200D 27A1
+1F9CE 1F3FE 200D 27A1
+1F9CE 1F3FF 200D 2640 200D 27A1
+1F9CE 1F3FF 200D 2642 200D 27A1
+1F9CE 1F3FF 200D 27A1
+1F9D1 200D 1F9AF 200D 27A1
+1F9D1 200D 1F9BC 200D 27A1
+1F9D1 200D 1F9BD 200D 27A1
+1F9D1 200D 1F9D1 200D 1F9D2
+1F9D1 200D 1F9D1 200D 1F9D2 200D 1F9D2
+1F9D1 200D 1F9D2
+1F9D1 200D 1F9D2 200D 1F9D2
+1F9D1 1F3FB 200D 1F9AF 200D 27A1
+1F9D1 1F3FB 200D 1F9BC 200D 27A1
+1F9D1 1F3FB 200D 1F9BD 200D 27A1
+1F9D1 1F3FC 200D 1F9AF 200D 27A1
+1F9D1 1F3FC 200D 1F9BC 200D 27A1
+1F9D1 1F3FC 200D 1F9BD 200D 27A1
+1F9D1 1F3FD 200D 1F9AF 200D 27A1
+1F9D1 1F3FD 200D 1F9BC 200D 27A1
+1F9D1 1F3FD 200D 1F9BD 200D 27A1
+1F9D1 1F3FE 200D 1F9AF 200D 27A1
+1F9D1 1F3FE 200D 1F9BC 200D 27A1
+1F9D1 1F3FE 200D 1F9BD 200D 27A1
+1F9D1 1F3FF 200D 1F9AF 200D 27A1
+1F9D1 1F3FF 200D 1F9BC 200D 27A1
+1F9D1 1F3FF 200D 1F9BD 200D 27A1