From 0dfe8d3f7effaf0fe6dc76786790d6650c9c7fae Mon Sep 17 00:00:00 2001 From: Romain Jobredeaux Date: Tue, 6 Sep 2022 16:20:09 -0400 Subject: [PATCH] Allowlist Kotlin-related libraries. Change-Id: Iaeea811d9ae71b6e57ca79246e0a1691d65ff6f2 Bug: 186462641 Test: Newly allowlisted libs fall under CI --- android/allowlists/allowlists.go | 6 ++++++ tests/lib.sh | 1 + 2 files changed, 7 insertions(+) diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 661dcf58e..287da742d 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -119,7 +119,10 @@ var ( "external/icu": Bp2BuildDefaultTrueRecursively, "external/icu/android_icu4j": Bp2BuildDefaultFalse, // java rules incomplete "external/icu/icu4j": Bp2BuildDefaultFalse, // java rules incomplete + "external/jacoco": Bp2BuildDefaultTrueRecursively, "external/jarjar": Bp2BuildDefaultTrueRecursively, + "external/javassist": Bp2BuildDefaultTrueRecursively, + "external/javaparser": Bp2BuildDefaultTrueRecursively, "external/javapoet": Bp2BuildDefaultTrueRecursively, "external/jemalloc_new": Bp2BuildDefaultTrueRecursively, "external/jsoncpp": Bp2BuildDefaultTrueRecursively, @@ -298,10 +301,12 @@ var ( // external/bazelbuild-rules_android/... is needed by mixed builds, otherwise mixed builds analysis fails // e.g. ERROR: Analysis of target '@soong_injection//mixed_builds:buildroot' failed "external/bazelbuild-rules_android":/* recursive = */ true, + "external/bazelbuild-kotlin-rules":/* recursive = */ true, "external/bazel-skylib":/* recursive = */ true, "external/guava":/* recursive = */ true, "external/jsr305":/* recursive = */ true, "external/protobuf":/* recursive = */ false, + "frameworks/base/tools/codegen":/* recursive = */ true, "frameworks/ex/common":/* recursive = */ true, "packages/apps/Music":/* recursive = */ true, @@ -537,6 +542,7 @@ var ( "generated_android_icu4j_resources", // depends on unconverted modules: android_icu4j_srcgen_binary, soong_zip "generated_android_icu4j_test_resources", // depends on unconverted modules: android_icu4j_srcgen_binary, soong_zip "host-libprotobuf-java-nano", // b/220869005, depends on libprotobuf-java-nano + "jacoco-stubs", // b/245767077, depends on droidstubs "libapexutil", // depends on unconverted modules: apex-info-list-tinyxml "libart", // depends on unconverted modules: apex-info-list-tinyxml, libtinyxml2, libnativeloader-headers, heapprofd_client_api, art_operator_srcs, libcpu_features, libodrstatslog, libelffile, art_cmdlineparser_headers, cpp-define-generator-definitions, libdexfile, libnativebridge, libnativeloader, libsigchain, libartbase, libprofile, cpp-define-generator-asm-support "libart-runtime-gtest", // depends on unconverted modules: libgtest_isolated, libart-compiler, libdexfile, libprofile, libartbase, libartbase-art-gtest diff --git a/tests/lib.sh b/tests/lib.sh index 6210e779e..7248adeb3 100644 --- a/tests/lib.sh +++ b/tests/lib.sh @@ -123,6 +123,7 @@ function create_mock_bazel { symlink_directory prebuilts/jdk symlink_directory external/bazel-skylib symlink_directory external/bazelbuild-rules_android + symlink_directory external/bazelbuild-kotlin-rules symlink_file WORKSPACE symlink_file BUILD