commit be5baad74a5732b7f5c231c8b673c392f720bc05
author yangbill <yangbill@google.com> Mon Mar 04 10:07:11 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 04 10:07:11 2024 +0000
tree 1fcc48de7fc519d63762fff5db89bbdd6ad6f965
parent 320cd670f730c0e2a26ffb79a8c2b1b9e2ba23ee
parent b65a4fa5399075409e4b83a14f0ad430d3ca9d16

Remove obsolete Android.mk am: b65a4fa539

Original change: https://android-review.googlesource.com/c/platform/external/flatbuffers/+/2984155

Change-Id: I4272b1484db212d4f38a1c6ce9f14039f3b39839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 83bb686..2e603bb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,10 +57,11 @@
     sdk_version: "current",
     min_sdk_version: "apex_inherit",
     apex_available: [
-        "com.android.neuralnetworks",
-        "test_com.android.neuralnetworks",
-        "com.android.extservices",
         "com.android.adservices",
+        "com.android.extservices",
+        "com.android.neuralnetworks",
+        "com.android.ondevicepersonalization",
+        "test_com.android.neuralnetworks",
         "//apex_available:platform",
     ],
 }

java/src/main/java/com/google/flatbuffers/.keep

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 0000000..e69de29
--- /dev/null
+++ b/java/src/main/java/com/google/flatbuffers/.keep