Merge changes I86f30b99,I2769c0d5 into main am: 3fb2002c9e am: 3a9ce197a9 am: 0aa01115e4 am: 2b99f4f4b0 am: a2dbcf025b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746855 Change-Id: I5c80ae1e7cfd083d5985e64841633328a5867d27 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -178,6 +178,7 @@ var (
|
||||
"external/libjpeg-turbo": Bp2BuildDefaultTrueRecursively,
|
||||
"external/libmpeg2": Bp2BuildDefaultTrueRecursively,
|
||||
"external/libpng": Bp2BuildDefaultTrueRecursively,
|
||||
"external/libphonenumber": Bp2BuildDefaultTrueRecursively,
|
||||
"external/libvpx": Bp2BuildDefaultTrueRecursively,
|
||||
"external/libyuv": Bp2BuildDefaultTrueRecursively,
|
||||
"external/lz4/lib": Bp2BuildDefaultTrue,
|
||||
@@ -1048,6 +1049,7 @@ 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++
|
||||
"libphonenumber_test", // depends on android.test.mock
|
||||
"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_*
|
||||
|
||||
Reference in New Issue
Block a user