Merge "Allowlist more modules under the adb package." am: 3c0c2db93a

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2213297

Change-Id: I37bd46e1f711633c2dd72c4d51d2e2adb6d52e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jingwen Chen 2022-09-12 05:20:12 +00:00 committed by Automerger Merge Worker
commit 052901988c

View file

@ -447,6 +447,9 @@ var (
"ILogcatManagerService_aidl", "ILogcatManagerService_aidl",
"libincremental_aidl-cpp", "libincremental_aidl-cpp",
"incremental_aidl", "incremental_aidl",
//frameworks/native/cmds/cmd
"libcmd",
} }
Bp2buildModuleTypeAlwaysConvertList = []string{ Bp2buildModuleTypeAlwaysConvertList = []string{
@ -526,7 +529,6 @@ var (
// unconverted deps // unconverted deps
"CarHTMLViewer", // depends on unconverted modules android.car-stubs, car-ui-lib "CarHTMLViewer", // depends on unconverted modules android.car-stubs, car-ui-lib
"abb", // depends on unconverted modules: libcmd, libbinder
"adb", // depends on unconverted modules: AdbWinApi, libandroidfw, libopenscreen-discovery, libopenscreen-platform-impl, libusb, bin2c_fastdeployagent, AdbWinUsbApi "adb", // depends on unconverted modules: AdbWinApi, libandroidfw, libopenscreen-discovery, libopenscreen-platform-impl, libusb, bin2c_fastdeployagent, AdbWinUsbApi
"android_icu4j_srcgen", // depends on unconverted modules: currysrc "android_icu4j_srcgen", // depends on unconverted modules: currysrc
"android_icu4j_srcgen_binary", // depends on unconverted modules: android_icu4j_srcgen, currysrc "android_icu4j_srcgen_binary", // depends on unconverted modules: android_icu4j_srcgen, currysrc
@ -607,10 +609,6 @@ var (
"Mp3DecoderTest", // depends on unconverted modules: libsndfile, libaudioutils "Mp3DecoderTest", // depends on unconverted modules: libsndfile, libaudioutils
"Mpeg4H263DecoderTest", // depends on unconverted modules: libstagefright_foundation "Mpeg4H263DecoderTest", // depends on unconverted modules: libstagefright_foundation
"Mpeg4H263EncoderTest", "Mpeg4H263EncoderTest",
"adb_crypto_test",
"adb_pairing_auth_test",
"adb_pairing_connection_test",
"adb_tls_connection_test",
"avcdec", "avcdec",
"avcenc", "avcenc",
"bionic-benchmarks-tests", "bionic-benchmarks-tests",
@ -706,7 +704,6 @@ var (
"yuvconstants", "yuvconstants",
"yuvconvert", "yuvconvert",
"zipalign_tests", "zipalign_tests",
// "zlib_tests",
// cc_test_library // cc_test_library
"clang_diagnostic_tests", "clang_diagnostic_tests",