| commit | b2cc67e1dfe0a2a4372c65648e9ac91cb43120f1 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Jan 29 21:10:14 2024 -0800 |
| committer | Xin Li <delphij@google.com> | Mon Jan 29 21:10:14 2024 -0800 |
| tree | b8f74b1198935dfdc4fb56444ac270665de7cb37 | |
| parent | 26cd937e60133896b4acd6b9263e484e22fdc3a6 [diff] | |
| parent | 2ba757a890a8cf921782bdbf64a84bb0bbed8546 [diff] |
Merge Android 24Q1 Release (ab/11220357) Bug: 319669529 Merged-In: I4a7964efb68cb7b85693263500d872581793d303 Change-Id: I034deb27e6228dd88c75f3943c8f12aeb7a9eb1f
diff --git a/emoji-compat-flatbuffers/Android.mk b/emoji-compat-flatbuffers/Android.mk index 00721b9..fad071e 100644 --- a/emoji-compat-flatbuffers/Android.mk +++ b/emoji-compat-flatbuffers/Android.mk
@@ -25,6 +25,6 @@ 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)