diff options
| author | Xin Li <delphij@google.com> | 2024-01-17 22:13:52 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-01-17 22:13:52 -0800 |
| commit | 320cd670f730c0e2a26ffb79a8c2b1b9e2ba23ee (patch) | |
| tree | 0c68fa8abd3772d6937aa4392b7058e18c9f163c | |
| parent | 8dcfc3d066fd54333404325472995e6424e857f1 (diff) | |
| parent | f37e75f311bc1bfbf870b18d86b66068d81e2ac8 (diff) | |
| download | flatbuffers-320cd670f730c0e2a26ffb79a8c2b1b9e2ba23ee.tar.gz | |
Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I9aa6edead1cf39caac70e93c1a0059bc2afae4fb
Change-Id: Ie095886c0cc39aae3841bcda8528f046b62dcc53
| -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 |