Snap for 10447354 from c3252a88f5b8b16900aec1fb222245aceb68a47b to mainline-wifi-release
Change-Id: I94dbbd57195fcf7561ecc9be0d268bbee0e0bab1
diff --git a/Android.bp b/Android.bp
index 03b4914..e010bf1 100755
--- a/Android.bp
+++ b/Android.bp
@@ -54,6 +54,7 @@
ramdisk_available: true,
vendor_ramdisk_available: true,
+ min_sdk_version: "apex_inherit",
apex_available: [
"//apex_available:platform",
"com.android.adbd",
@@ -102,6 +103,21 @@
static_libs: ["libbrotli"],
}
+cc_library_shared {
+ name: "libbrotli_encoder_jni",
+ host_supported: true,
+ srcs: [
+ "java/org/brotli/wrapper/enc/encoder_jni.cc",
+ ],
+ static_libs: [
+ "libnativehelper_lazy",
+ "libbrotli",
+ ],
+ cflags: [
+ "-Wno-unused-parameter",
+ ],
+}
+
//
// Support for brotli in java code.
//
@@ -113,6 +129,10 @@
srcs: ["java/**/*.java"],
exclude_srcs: ["java/**/*Test.java"],
sdk_version: "current",
+ // TODO(b/237039251) use "apex_inherit" when Java modules support it
+ min_sdk_version: "29",
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
}
// TODO(b/171429704): Remove this genrule and use the fuzz_data.zip