diff options
| author | Xin Li <delphij@google.com> | 2024-03-06 09:29:53 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-03-06 09:29:53 -0800 |
| commit | 02e8e1342f0446f80a608a468fbc7fbf2bc7b28f (patch) | |
| tree | 1fcc48de7fc519d63762fff5db89bbdd6ad6f965 | |
| parent | b65a4fa5399075409e4b83a14f0ad430d3ca9d16 (diff) | |
| parent | be5baad74a5732b7f5c231c8b673c392f720bc05 (diff) | |
| download | flatbuffers-main.tar.gz | |
Merge Android 14 QPR2 to AOSP mainHEADmastermainemu-34-2-dev
Bug: 319669529
Merged-In: I4272b1484db212d4f38a1c6ce9f14039f3b39839
Change-Id: I01db6da8ed1cfbbc05b06dae21f20f4537b30bb4
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | java/src/main/java/com/google/flatbuffers/.keep | 0 |
2 files changed, 3 insertions, 2 deletions
@@ -57,10 +57,11 @@ cc_library_headers { sdk_version: "current", min_sdk_version: "apex_inherit", apex_available: [ + "com.android.adservices", + "com.android.extservices", "com.android.neuralnetworks", + "com.android.ondevicepersonalization", "test_com.android.neuralnetworks", - "com.android.extservices", - "com.android.adservices", "//apex_available:platform", ], } diff --git a/java/src/main/java/com/google/flatbuffers/.keep b/java/src/main/java/com/google/flatbuffers/.keep new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/java/src/main/java/com/google/flatbuffers/.keep |