diff options
| author | 2022-03-30 21:08:12 +0000 | |
|---|---|---|
| committer | 2022-03-30 21:08:12 +0000 | |
| commit | 3c25ab1ac3c942f50b976248c145c8839d1572bb (patch) | |
| tree | ba4f0ef74e3d1035f22e52f4214a449b9941914f /android/bazel.go | |
| parent | d93afba1e6f9313f171be91b52dec807ccd420af (diff) | |
| parent | 77267c7d9c998ebe8b651bfd0e82edbca21d16eb (diff) | |
Merge changes I8e4c3f37,I89a32bde
* changes:
add plugins to javaLibraryAttributes
convert java_import_host with bp2build; enable jetifier
Diffstat (limited to 'android/bazel.go')
| -rw-r--r-- | android/bazel.go | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/android/bazel.go b/android/bazel.go index 7a22a2ee7..fafb68b0c 100644 --- a/android/bazel.go +++ b/android/bazel.go @@ -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) |