|
@@ -357,6 +357,7 @@ var (
|
|
|
"packages/services/Car/tests/SampleRearViewCamera": Bp2BuildDefaultTrue,
|
|
|
"prebuilts/clang/host/linux-x86": Bp2BuildDefaultTrueRecursively,
|
|
|
"prebuilts/tools/common/m2": Bp2BuildDefaultTrue,
|
|
|
+ "prebuilts/sdk/tools/jetifier/jetifier-standalone": Bp2BuildDefaultTrue,
|
|
|
"system/apex": Bp2BuildDefaultFalse, // TODO(b/207466993): flaky failures
|
|
|
"system/apex/proto": Bp2BuildDefaultTrueRecursively,
|
|
|
"system/apex/libs": Bp2BuildDefaultTrueRecursively,
|
|
@@ -415,12 +416,21 @@ var (
|
|
|
|
|
|
//system/extras/verity/fec
|
|
|
"fec",
|
|
|
+
|
|
|
+ //packages/apps/Car/libs/car-ui-lib/car-ui-androidx
|
|
|
+ // genrule dependencies for java_imports
|
|
|
+ "car-ui-androidx-annotation-nodeps",
|
|
|
+ "car-ui-androidx-collection-nodeps",
|
|
|
+ "car-ui-androidx-core-common-nodeps",
|
|
|
+ "car-ui-androidx-lifecycle-common-nodeps",
|
|
|
+ "car-ui-androidx-constraintlayout-solver-nodeps",
|
|
|
}
|
|
|
|
|
|
// Per-module-type allowlist to always opt modules in to both bp2build and mixed builds
|
|
|
// when they have the same type as one listed.
|
|
|
bp2buildModuleTypeAlwaysConvertList = []string{
|
|
|
"java_import",
|
|
|
+ "java_import_host",
|
|
|
}
|
|
|
|
|
|
// Per-module denylist to always opt modules out of both bp2build and mixed builds.
|
|
@@ -560,18 +570,7 @@ var (
|
|
|
"art-script", // depends on unconverted modules: dalvikvm, dex2oat
|
|
|
"dex2oat-script", // depends on unconverted modules: dex2oat
|
|
|
|
|
|
- // TODO(b/221082840) convert java_imports in //packages/apps/Car/libs/car-ui-lib/...
|
|
|
- "prebuilt_car-ui-androidx-annotation",
|
|
|
- "prebuilt_car-ui-androidx-annotation-nodeps",
|
|
|
- "prebuilt_car-ui-androidx-collection",
|
|
|
- "prebuilt_car-ui-androidx-collection-nodeps",
|
|
|
- "prebuilt_car-ui-androidx-core-common",
|
|
|
- "prebuilt_car-ui-androidx-core-common-nodeps",
|
|
|
- "prebuilt_car-ui-androidx-lifecycle-common",
|
|
|
- "prebuilt_car-ui-androidx-lifecycle-common-nodeps",
|
|
|
- "prebuilt_car-ui-androidx-constraintlayout-solver",
|
|
|
- "prebuilt_car-ui-androidx-constraintlayout-solver-nodeps",
|
|
|
-
|
|
|
+ "prebuilt_car-ui-androidx-core-common", // b/224773339, genrule dependency creates an .aar, not a .jar
|
|
|
"prebuilt_art-module-host-exports_okhttp-norepackage@current", // aosp/1999250, needs Jars (arch variant)
|
|
|
"prebuilt_conscrypt-unbundled", // aosp/1999250, needs Jars (arch variant)
|
|
|
"prebuilt_conscrypt-module-host-exports_conscrypt-unbundled@current", // aosp/1999250, needs Jars (arch variant)
|