Snap for 10460766 from d5dc9e72a5201c5ed36d612d32395d484b50caf2 to mainline-healthfitness-releaseaml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030android14-mainline-healthfitness-release

Change-Id: I3af3576d3e2d5dbe77252404fd7ee77fb2c28251

3 files changed, 59 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..503be33
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,42 @@
+filegroup {
+    name: "cuckoofilter_srcs",
+    srcs: ["java/com/google/setfilters/cuckoofilter/*.java"],
+}
+
+filegroup {
+    name: "cuckoofilter_test_srcs",
+    srcs: ["javatests/com/google/setfilters/cuckoofilter/*.java"],
+    // For now exclude tests with mocks.
+    exclude_srcs: ["javatests/com/google/setfilters/cuckoofilter/CuckooFilterTableTest.java"],
+}
+
+java_library {
+    name: "cuckoofilter",
+    host_supported: true,
+    hostdex: true,
+    sdk_version: "core_current",
+    srcs: [":cuckoofilter_srcs"],
+    static_libs: [
+        "guava",
+        "error_prone_annotations",
+    ],
+}
+
+android_test {
+    name: "cuckoofiltertest",
+
+    srcs: [":cuckoofilter_test_srcs"],
+    sdk_version: "current",
+    min_sdk_version: "21",
+
+    static_libs: [
+        "androidx.test.runner",
+        "cuckoofilter",
+        "junit",
+        "truth",
+        "truth-java8-extension",
+    ],
+    certificate: "platform",
+
+    test_suites: ["device-tests"],
+}
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
new file mode 100644
index 0000000..83c070d
--- /dev/null
+++ b/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.setfilters.cuckoofilter" >
+
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
+
+  <application>
+      <uses-library android:name="android.test.runner" />
+  </application>
+
+  <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+                   android:targetPackage="com.google.setfilters.cuckoofilter"
+                   android:label="Cuckoo Filter Instrumentation Test"/>
+
+</manifest>
diff --git a/java/com/google/setfilters/cuckoofilter/SerializedCuckooFilterTable.java b/java/com/google/setfilters/cuckoofilter/SerializedCuckooFilterTable.java
index 4d5b48e..c1b298c 100644
--- a/java/com/google/setfilters/cuckoofilter/SerializedCuckooFilterTable.java
+++ b/java/com/google/setfilters/cuckoofilter/SerializedCuckooFilterTable.java
@@ -17,7 +17,7 @@ package com.google.setfilters.cuckoofilter;
 import java.util.Arrays;
 
 /** Serialization of {@link CuckooFilterTable}. */
-final class SerializedCuckooFilterTable {
+public final class SerializedCuckooFilterTable {
   private final byte[] rawSerialization;
 
   /** Creates serialization from raw byte array. */