diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-03 15:49:14 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-03 15:49:14 +0000 |
commit | 4135d60cc739e7e3faf142cfec7b6b2ffce6c6ee (patch) | |
tree | 758f0aef9f1294472ac24358629903149ce7c92b | |
parent | cfb1546979f079ce186daea036fca8a63b7c0825 (diff) | |
parent | c3252a88f5b8b16900aec1fb222245aceb68a47b (diff) | |
download | brotli-aml_adb_340912530.tar.gz |
Snap for 10428683 from c3252a88f5b8b16900aec1fb222245aceb68a47b to mainline-adbd-releaseaml_adb_341520010aml_adb_341517070aml_adb_340912530aml_adb_340912350aml_adb_340912200aml_adb_340912000android14-mainline-adbd-release
Change-Id: Ic2eb4f323044c1b53fd808e8a54f4bc45b314a5c
-rwxr-xr-x | Android.bp | 20 |
1 files changed, 20 insertions, 0 deletions
@@ -54,6 +54,7 @@ cc_library_static { ramdisk_available: true, vendor_ramdisk_available: true, + min_sdk_version: "apex_inherit", apex_available: [ "//apex_available:platform", "com.android.adbd", @@ -102,6 +103,21 @@ cc_binary { 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 @@ java_library { 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 |