diff options
| author | Romain Jobredeaux <jobredeaux@google.com> | 2023-04-13 22:32:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-13 22:32:40 +0000 |
| commit | f958f61007147909002b1cf6f8e66fd7d6331415 (patch) | |
| tree | 44f6bf467d5e70383e2335eb56c28d9c3511fd49 /android | |
| parent | 012ecd2f565acf53ce3276d663fc0b167bd75361 (diff) | |
| parent | e9ab0a3cefd75985e1aef5bc3d7120925e1651ea (diff) | |
| download | soong-f958f61007147909002b1cf6f8e66fd7d6331415.tar.gz | |
Merge "Bp2build support for sdk_version and java_version." am: a3c029e7d5 am: f8ebe7f3e8 am: e9ab0a3cef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2454209
Change-Id: I37aac3f2bc75d86d40dc673cb0a43c475abd41cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'android')
| -rw-r--r-- | android/allowlists/allowlists.go | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 33209c397..d7e598b9e 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -408,8 +408,6 @@ var ( // this BUILD file is globbed by //external/icu/icu4c/source:icu4c_test_data's "data/**/*". "external/icu/icu4c/source/data/unidata/norm2":/* recursive = */ false, - "frameworks/ex/common":/* recursive = */ true, - // Building manually due to b/179889880: resource files cross package boundary "packages/apps/Music":/* recursive = */ true, @@ -690,7 +688,6 @@ var ( "libcodec2_soft_common", // kotlin srcs in java libs - "CtsPkgInstallerConstants", "kotlinx_atomicfu", // kotlin srcs in java binary @@ -703,6 +700,9 @@ var ( //kotlin srcs in android_binary "MusicKotlin", + // java_library with prebuilt sdk_version + "android-common", + // checked in current.txt for merged_txts "non-updatable-current.txt", "non-updatable-system-current.txt", @@ -725,7 +725,6 @@ var ( // min_sdk_version in android_app "CtsShimUpgrade", - "fake-framework", } Bp2buildModuleTypeAlwaysConvertList = []string{ @@ -779,7 +778,8 @@ var ( "tjbench", // TODO(b/240563612): Stem property // java bugs - "libbase_ndk", // TODO(b/186826477): fails to link libctscamera2_jni for device (required for CtsCameraTestCases) + "libbase_ndk", // TODO(b/186826477): fails to link libctscamera2_jni for device (required for CtsCameraTestCases) + "bouncycastle", // TODO(b/274474005): Need support for custom system_modules. // python protos "libprotobuf-python", // Has a handcrafted alternative @@ -846,7 +846,6 @@ var ( "libgmock_ndk", // depends on unconverted modules: libgtest_ndk_c++ "libnativehelper_lazy_mts_jni", "libnativehelper_mts_jni", // depends on unconverted modules: libnativetesthelper_jni, libgmock_ndk "libnativetesthelper_jni", // depends on unconverted modules: libgtest_ndk_c++ - "libprotobuf-java-nano", // b/220869005, depends on non-public_current SDK "libstatslog", // depends on unconverted modules: libstatspull, statsd-aidl-ndk "libstatslog_art", // depends on unconverted modules: statslog_art.cpp, statslog_art.h "linker_reloc_bench_main", // depends on unconverted modules: liblinker_reloc_bench_* @@ -1396,6 +1395,16 @@ var ( // TODO(b/266459895): depends on libunwindstack "libutils_test", + + // TODO(b/274805756): Support core_platform and current java APIs + "fake-framework", + + // TODO(b/277616982): These modules depend on private java APIs, but maybe they don't need to. + "StreamingProtoTest", + "textclassifierprotoslite", + "styleprotoslite", + "CtsPkgInstallerConstants", + "guava-android-testlib", } MixedBuildsDisabledList = []string{ |