aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-04-11 18:15:37 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-04-11 18:15:37 +0000
commita166adbb92001c629fcb72387b649bdbdfed5a38 (patch)
tree1fcc48de7fc519d63762fff5db89bbdd6ad6f965
parenteb52555aba2323b4fa1fc9bea8d64d73d9cf6974 (diff)
parent02e8e1342f0446f80a608a468fbc7fbf2bc7b28f (diff)
downloadflatbuffers-emu-34-2-release.tar.gz
Snap for 11702928 from 02e8e1342f0446f80a608a468fbc7fbf2bc7b28f to emu-34-2-releaseemu-34-2-release
Change-Id: I0690a77acd9e6471d2fcf06d83c8eae494cfcfaf
-rw-r--r--Android.bp5
-rw-r--r--Android.mk1
-rw-r--r--java/src/main/java/com/google/flatbuffers/.keep0
3 files changed, 3 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 83bb686b..2e603bb5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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/Android.mk b/Android.mk
deleted file mode 100644
index 6e3fa354..00000000
--- a/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-# Empty Android.mk to shadow android/jni/Android.mk and samples/android/jni/Android.mk
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