diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-21 18:52:09 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-21 18:52:09 +0000 |
commit | da91e1d94069dd02f4bdd19276100703f6968801 (patch) | |
tree | cc0d1c6e576d0b77f58c929a5fda662c7aa3a768 | |
parent | e2d8c0c3121fc936a67a35f12e95e024aa21d3fb (diff) | |
parent | aa5a0600932bda6f0f3a9f7c3483705e3abd0244 (diff) | |
download | Launcher3-da91e1d94069dd02f4bdd19276100703f6968801.tar.gz |
Merge "List baseline_filename on modules that are implititly using it" into main am: aa5a060093
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2886506
Change-Id: Ib6973650c99c5d92a3548864e56fb3a977766249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 94 |
1 files changed, 70 insertions, 24 deletions
diff --git a/Android.bp b/Android.bp index b68e1e5448..597cc04b74 100644 --- a/Android.bp +++ b/Android.bp @@ -23,42 +23,66 @@ min_launcher3_sdk_version = "26" // All sources are split so they can be reused in many other libraries/apps in other folders filegroup { name: "launcher-src", - srcs: [ "src/**/*.java", "src/**/*.kt" ], + srcs: [ + "src/**/*.java", + "src/**/*.kt", + ], } filegroup { name: "launcher-quickstep-src", - srcs: [ "quickstep/src/**/*.java", "quickstep/src/**/*.kt" ], + srcs: [ + "quickstep/src/**/*.java", + "quickstep/src/**/*.kt", + ], } filegroup { name: "launcher-go-src", - srcs: [ "go/src/**/*.java", "go/src/**/*.kt" ], + srcs: [ + "go/src/**/*.java", + "go/src/**/*.kt", + ], } filegroup { name: "launcher-go-quickstep-src", - srcs: [ "go/quickstep/src/**/*.java", "go/quickstep/src/**/*.kt" ], + srcs: [ + "go/quickstep/src/**/*.java", + "go/quickstep/src/**/*.kt", + ], } filegroup { name: "launcher-src_shortcuts_overrides", - srcs: [ "src_shortcuts_overrides/**/*.java", "src_shortcuts_overrides/**/*.kt" ], + srcs: [ + "src_shortcuts_overrides/**/*.java", + "src_shortcuts_overrides/**/*.kt", + ], } filegroup { name: "launcher-src_ui_overrides", - srcs: [ "src_ui_overrides/**/*.java", "src_ui_overrides/**/*.kt" ], + srcs: [ + "src_ui_overrides/**/*.java", + "src_ui_overrides/**/*.kt", + ], } filegroup { name: "launcher-ext_tests", - srcs: [ "ext_tests/**/*.java", "ext_tests/**/*.kt" ], + srcs: [ + "ext_tests/**/*.java", + "ext_tests/**/*.kt", + ], } filegroup { name: "launcher-quickstep-ext_tests", - srcs: [ "quickstep/ext_tests/**/*.java", "quickstep/ext_tests/**/*.kt" ], + srcs: [ + "quickstep/ext_tests/**/*.java", + "quickstep/ext_tests/**/*.kt", + ], } // Proguard files for Launcher3 @@ -85,9 +109,12 @@ android_library { srcs: [ "tests/tapl/**/*.java", ], - resource_dirs: [ ], + resource_dirs: [], manifest: "tests/tapl/AndroidManifest.xml", platform_apis: true, + lint: { + baseline_filename: "lint-baseline.xml", + }, } java_library_static { @@ -99,12 +126,15 @@ java_library_static { sdk_version: "current", proto: { type: "lite", - local_include_dirs:[ + local_include_dirs: [ "protos", "protos_overrides", ], }, static_libs: ["libprotobuf-java-lite"], + lint: { + baseline_filename: "lint-baseline.xml", + }, } java_library_static { @@ -115,14 +145,17 @@ java_library_static { sdk_version: "current", proto: { type: "lite", - local_include_dirs:[ + local_include_dirs: [ "quickstep/protos_overrides", ], }, static_libs: [ - "libprotobuf-java-lite", - "launcher_log_protos_lite" - ], + "libprotobuf-java-lite", + "launcher_log_protos_lite", + ], + lint: { + baseline_filename: "lint-baseline.xml", + }, } java_library { @@ -134,12 +167,15 @@ java_library { sdk_version: "current", min_sdk_version: min_launcher3_sdk_version, + lint: { + baseline_filename: "lint-baseline.xml", + }, } // Library with all the dependencies for building Launcher3 android_library { name: "Launcher3ResLib", - srcs: [ ], + srcs: [], resource_dirs: ["res"], static_libs: [ "LauncherPluginLib", @@ -154,7 +190,7 @@ android_library { "com.google.android.material_material", "iconloader_base", "view_capture", - "animationlib" + "animationlib", ], manifest: "AndroidManifest-common.xml", sdk_version: "current", @@ -173,7 +209,7 @@ android_library { static_libs: [ "Launcher3ResLib", "launcher-testing-shared", - "animationlib" + "animationlib", ], sdk_version: "current", min_sdk_version: min_launcher3_sdk_version, @@ -233,7 +269,7 @@ android_app { // Library with all the dependencies for building quickstep android_library { name: "QuickstepResLib", - srcs: [ ], + srcs: [], resource_dirs: [ "quickstep/res", ], @@ -249,9 +285,11 @@ android_library { ], manifest: "quickstep/AndroidManifest.xml", min_sdk_version: "current", + lint: { + baseline_filename: "lint-baseline.xml", + }, } - // Library with all the dependencies for building Launcher Go android_library { name: "LauncherGoResLib", @@ -356,7 +394,10 @@ android_app { manifest: "go/AndroidManifest.xml", jacoco: { include_filter: ["com.android.launcher3.*"], - } + }, + lint: { + baseline_filename: "lint-baseline.xml", + }, } @@ -392,7 +433,10 @@ android_app { manifest: "quickstep/AndroidManifest.xml", jacoco: { include_filter: ["com.android.launcher3.*"], - } + }, + lint: { + baseline_filename: "lint-baseline.xml", + }, } @@ -410,7 +454,7 @@ android_app { min_sdk_version: "current", target_sdk_version: "current", - srcs: [ ], + srcs: [], resource_dirs: [ "go/quickstep/res", @@ -442,7 +486,9 @@ android_app { manifest: "quickstep/AndroidManifest.xml", jacoco: { include_filter: ["com.android.launcher3.*"], - } + }, + lint: { + baseline_filename: "lint-baseline.xml", + }, } - |