Merge "Merge Android 14 QPR2 to AOSP main" into main
diff --git a/emoji-compat-flatbuffers/Android.bp b/emoji-compat-flatbuffers/Android.bp
new file mode 100644
index 0000000..5230667
--- /dev/null
+++ b/emoji-compat-flatbuffers/Android.bp
@@ -0,0 +1,31 @@
+// Copyright (C) 2017 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+ // See: http://go/android-license-faq
+ default_applicable_licenses: [
+ "Android-Apache-2.0",
+ ],
+}
+
+java_library {
+ name: "noto-emoji-compat-flatbuffers-java",
+ srcs: ["src/java/**/*.java"],
+ sdk_version: "current",
+
+ static_libs: ["flatbuffers-java"],
+
+ java_version: "1.8",
+ jarjar_rules: "jarjar-rules.txt",
+}
diff --git a/emoji-compat-flatbuffers/Android.mk b/emoji-compat-flatbuffers/Android.mk
deleted file mode 100644
index fad071e..0000000
--- a/emoji-compat-flatbuffers/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := noto-emoji-compat-flatbuffers-java
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_SRC_FILES := $(call all-java-files-under, src/java)
-LOCAL_SDK_VERSION := current
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- flatbuffers-java
-
-LOCAL_JAR_EXCLUDE_FILES := none
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
-LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
-include $(BUILD_STATIC_JAVA_LIBRARY)
