From 8a3f399d196951bd2c867f07bc8834417f6e9bc7 Mon Sep 17 00:00:00 2001 From: Muhammad Haseeb Ahmad Date: Thu, 23 Jun 2022 00:03:34 +0000 Subject: Make a libbrotli_encoder_jni shared library from encoder_jni.cc This is required for the JavaCompressFuzzer: https://r.android.com/2135512 Test: m libbrotli_encoder_jni Bug: 236747140 Change-Id: I5c1ce687618fc4b9a8254d813d4e29b94e83e408 --- Android.bp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Android.bp b/Android.bp index 03b4914..4aca318 100755 --- a/Android.bp +++ b/Android.bp @@ -102,6 +102,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. // -- cgit v1.2.3 From 6d3859a0dbeb485ca1d6e41a083849dc5df10063 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Fri, 24 Jun 2022 14:56:17 +0900 Subject: Set min_sdk_version This was done via the hard-coded list in build/soong. Bug: 158059172 Test: m Change-Id: Ic4fd84753a2c70972e014cfcb1cd8e4bef0e41d8 --- Android.bp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Android.bp b/Android.bp index 03b4914..c3bcadf 100755 --- a/Android.bp +++ b/Android.bp @@ -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", @@ -113,6 +114,8 @@ 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", } // TODO(b/171429704): Remove this genrule and use the fuzz_data.zip -- cgit v1.2.3 From 3c8db5a1c2f25900d6c519a16a56f9dd9f4d315d Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Fri, 24 Jun 2022 14:56:17 +0900 Subject: Set min_sdk_version This was done via the hard-coded list in build/soong. Bug: 158059172 Test: m Merged-In: Ic4fd84753a2c70972e014cfcb1cd8e4bef0e41d8 Change-Id: Ic4fd84753a2c70972e014cfcb1cd8e4bef0e41d8 --- Android.bp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Android.bp b/Android.bp index 03b4914..c3bcadf 100755 --- a/Android.bp +++ b/Android.bp @@ -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", @@ -113,6 +114,8 @@ 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", } // TODO(b/171429704): Remove this genrule and use the fuzz_data.zip -- cgit v1.2.3 From e6ede5ce617f9029a2b34e57e3f00c3079d561d2 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Fri, 24 Jun 2022 14:56:17 +0900 Subject: Set min_sdk_version This was done via the hard-coded list in build/soong. Bug: 158059172 Test: m Merged-In: Ic4fd84753a2c70972e014cfcb1cd8e4bef0e41d8 Change-Id: Ic4fd84753a2c70972e014cfcb1cd8e4bef0e41d8 (cherry picked from commit 4091c801df08f319189fa09d17300fd573a60c2a) --- Android.bp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Android.bp b/Android.bp index 03b4914..c3bcadf 100755 --- a/Android.bp +++ b/Android.bp @@ -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", @@ -113,6 +114,8 @@ 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", } // TODO(b/171429704): Remove this genrule and use the fuzz_data.zip -- cgit v1.2.3 From db47d083aca57ddd5097ebb11547395b1261a9de Mon Sep 17 00:00:00 2001 From: Frank Feng Date: Mon, 6 Mar 2023 09:09:03 -0800 Subject: Pin tradefed dependencies to Java 11 Bug: 267831518 Test: TH Change-Id: I90a6086991b4217f5b429c6352a797f4834947e7 --- Android.bp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Android.bp b/Android.bp index cecc70f..e010bf1 100755 --- a/Android.bp +++ b/Android.bp @@ -131,6 +131,8 @@ java_library { 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 -- cgit v1.2.3