diff options
author | Sorin Basca <sorinbasca@google.com> | 2024-01-29 20:49:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-29 20:49:46 +0000 |
commit | 26cd937e60133896b4acd6b9263e484e22fdc3a6 (patch) | |
tree | 6f2c51ea00024018f7a94e1c40f39a3f7048833c | |
parent | 90e388026e01a0ce9772031ce573b56b68ddf191 (diff) | |
parent | 46e947cc33a890f689038ff322edd51606f7c8fc (diff) | |
download | noto-fonts-26cd937e60133896b4acd6b9263e484e22fdc3a6.tar.gz |
Merge "Use Java target 1.8 as 1.7 no longer supported" into main am: 46e947cc33
Original change: https://android-review.googlesource.com/c/platform/external/noto-fonts/+/2927753
Change-Id: I9ac7ba50dee1f1f3f383cd2f476ab5513aab3b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | emoji-compat-flatbuffers/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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) |