Set use_resource_processor: false
These modules fail to compile when use_resource_processor is enabled
by default, disable them explicitly for now.
Bug: 319712088
Test: m javac-check
Flag: NA
Change-Id: I0f7ee108aab802ee1882f8017ea4b47346e38683
diff --git a/Android.bp b/Android.bp
index 39b1ae0..eca0778 100644
--- a/Android.bp
+++ b/Android.bp
@@ -309,6 +309,8 @@
"AndroidManifest-common.xml",
],
min_sdk_version: "current",
+ // TODO(b/319712088): re-enable use_resource_processor
+ use_resource_processor: false,
}
// Build rule for Quickstep library
@@ -337,6 +339,8 @@
manifest: "quickstep/AndroidManifest.xml",
platform_apis: true,
min_sdk_version: "current",
+ // TODO(b/319712088): re-enable use_resource_processor
+ use_resource_processor: false,
}
// Build rule for Launcher3 Go app for Android Go devices.
diff --git a/tests/Android.bp b/tests/Android.bp
index a236954..310e418 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -21,13 +21,13 @@
filegroup {
name: "launcher-tests-src",
srcs: [
- "src/**/*.java",
- "src/**/*.kt",
- "multivalentTests/src/**/*.java",
- "multivalentTests/src/**/*.kt",
+ "src/**/*.java",
+ "src/**/*.kt",
+ "multivalentTests/src/**/*.java",
+ "multivalentTests/src/**/*.kt",
],
exclude_srcs: [
- ":launcher-non-quickstep-tests-src"
+ ":launcher-non-quickstep-tests-src",
],
}
@@ -35,25 +35,25 @@
filegroup {
name: "launcher-image-tests-helpers",
srcs: [
- "multivalentTests/src/com/android/launcher3/celllayout/board/*.java",
- "multivalentTests/src/com/android/launcher3/celllayout/board/*.kt",
- "multivalentTests/src/com/android/launcher3/celllayout/FavoriteItemsTransaction.java",
- "multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java",
- "multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java",
- "multivalentTests/src/com/android/launcher3/ui/TestViewHelpers.java",
- "multivalentTests/src/com/android/launcher3/util/LauncherLayoutBuilder.java",
- "multivalentTests/src/com/android/launcher3/util/ModelTestExtensions.kt",
- "multivalentTests/src/com/android/launcher3/util/TestConstants.java",
- "multivalentTests/src/com/android/launcher3/util/TestUtil.java",
- "multivalentTests/src/com/android/launcher3/util/Wait.java",
- "multivalentTests/src/com/android/launcher3/util/WidgetUtils.java",
- "multivalentTests/src/com/android/launcher3/util/rule/*.java",
- "multivalentTests/src/com/android/launcher3/util/rule/*.kt",
- "multivalentTests/src/com/android/launcher3/util/rule/*.java",
- "multivalentTests/src/com/android/launcher3/util/rule/*.kt",
- "multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/*.java",
- "multivalentTests/src/com/android/launcher3/testcomponent/*.java",
- "multivalentTests/src/com/android/launcher3/testcomponent/*.kt",
+ "multivalentTests/src/com/android/launcher3/celllayout/board/*.java",
+ "multivalentTests/src/com/android/launcher3/celllayout/board/*.kt",
+ "multivalentTests/src/com/android/launcher3/celllayout/FavoriteItemsTransaction.java",
+ "multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java",
+ "multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java",
+ "multivalentTests/src/com/android/launcher3/ui/TestViewHelpers.java",
+ "multivalentTests/src/com/android/launcher3/util/LauncherLayoutBuilder.java",
+ "multivalentTests/src/com/android/launcher3/util/ModelTestExtensions.kt",
+ "multivalentTests/src/com/android/launcher3/util/TestConstants.java",
+ "multivalentTests/src/com/android/launcher3/util/TestUtil.java",
+ "multivalentTests/src/com/android/launcher3/util/Wait.java",
+ "multivalentTests/src/com/android/launcher3/util/WidgetUtils.java",
+ "multivalentTests/src/com/android/launcher3/util/rule/*.java",
+ "multivalentTests/src/com/android/launcher3/util/rule/*.kt",
+ "multivalentTests/src/com/android/launcher3/util/rule/*.java",
+ "multivalentTests/src/com/android/launcher3/util/rule/*.kt",
+ "multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/*.java",
+ "multivalentTests/src/com/android/launcher3/testcomponent/*.java",
+ "multivalentTests/src/com/android/launcher3/testcomponent/*.kt",
],
}
@@ -61,8 +61,8 @@
filegroup {
name: "launcher-non-quickstep-tests-src",
srcs: [
- "src/com/android/launcher3/nonquickstep/**/*.java",
- "src/com/android/launcher3/nonquickstep/**/*.kt",
+ "src/com/android/launcher3/nonquickstep/**/*.java",
+ "src/com/android/launcher3/nonquickstep/**/*.kt",
],
}
@@ -70,42 +70,42 @@
filegroup {
name: "launcher-oop-tests-src",
srcs: [
- "src/com/android/launcher3/allapps/TaplOpenCloseAllAppsTest.java",
- "src/com/android/launcher3/allapps/TaplAllAppsIconsWorkingTest.java",
- "src/com/android/launcher3/appiconmenu/TaplAppIconMenuTest.java",
- "src/com/android/launcher3/dragging/TaplDragTest.java",
- "src/com/android/launcher3/dragging/TaplUninstallRemoveTest.java",
- "multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java",
- "multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java",
- "src/com/android/launcher3/ui/TaplTestsLauncher3Test.java",
- "src/com/android/launcher3/ui/widget/TaplWidgetPickerTest.java",
- "src/com/android/launcher3/ui/workspace/TaplWorkspaceTest.java",
- "multivalentTests/src/com/android/launcher3/util/LauncherLayoutBuilder.java",
- "multivalentTests/src/com/android/launcher3/util/TestConstants.java",
- "multivalentTests/src/com/android/launcher3/util/TestUtil.java",
- "multivalentTests/src/com/android/launcher3/util/Wait.java",
- "multivalentTests/src/com/android/launcher3/util/WidgetUtils.java",
- "multivalentTests/src/com/android/launcher3/util/rule/FailureWatcher.java",
- "multivalentTests/src/com/android/launcher3/util/rule/ViewCaptureRule.kt",
- "multivalentTests/src/com/android/launcher3/util/rule/SamplerRule.java",
- "multivalentTests/src/com/android/launcher3/util/rule/ScreenRecordRule.java",
- "multivalentTests/src/com/android/launcher3/util/rule/ShellCommandRule.java",
- "multivalentTests/src/com/android/launcher3/util/rule/TestIsolationRule.java",
- "multivalentTests/src/com/android/launcher3/util/rule/TestStabilityRule.java",
- "multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/*.java",
- "multivalentTests/src/com/android/launcher3/testcomponent/BaseTestingActivity.java",
- "multivalentTests/src/com/android/launcher3/testcomponent/OtherBaseTestingActivity.java",
- "multivalentTests/src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java",
- "multivalentTests/src/com/android/launcher3/testcomponent/TestCommandReceiver.java",
- "multivalentTests/src/com/android/launcher3/testcomponent/TestLauncherActivity.java",
- "multivalentTests/src/com/android/launcher3/testcomponent/ImeTestActivity.java",
+ "src/com/android/launcher3/allapps/TaplOpenCloseAllAppsTest.java",
+ "src/com/android/launcher3/allapps/TaplAllAppsIconsWorkingTest.java",
+ "src/com/android/launcher3/appiconmenu/TaplAppIconMenuTest.java",
+ "src/com/android/launcher3/dragging/TaplDragTest.java",
+ "src/com/android/launcher3/dragging/TaplUninstallRemoveTest.java",
+ "multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java",
+ "multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java",
+ "src/com/android/launcher3/ui/TaplTestsLauncher3Test.java",
+ "src/com/android/launcher3/ui/widget/TaplWidgetPickerTest.java",
+ "src/com/android/launcher3/ui/workspace/TaplWorkspaceTest.java",
+ "multivalentTests/src/com/android/launcher3/util/LauncherLayoutBuilder.java",
+ "multivalentTests/src/com/android/launcher3/util/TestConstants.java",
+ "multivalentTests/src/com/android/launcher3/util/TestUtil.java",
+ "multivalentTests/src/com/android/launcher3/util/Wait.java",
+ "multivalentTests/src/com/android/launcher3/util/WidgetUtils.java",
+ "multivalentTests/src/com/android/launcher3/util/rule/FailureWatcher.java",
+ "multivalentTests/src/com/android/launcher3/util/rule/ViewCaptureRule.kt",
+ "multivalentTests/src/com/android/launcher3/util/rule/SamplerRule.java",
+ "multivalentTests/src/com/android/launcher3/util/rule/ScreenRecordRule.java",
+ "multivalentTests/src/com/android/launcher3/util/rule/ShellCommandRule.java",
+ "multivalentTests/src/com/android/launcher3/util/rule/TestIsolationRule.java",
+ "multivalentTests/src/com/android/launcher3/util/rule/TestStabilityRule.java",
+ "multivalentTests/src/com/android/launcher3/util/viewcapture_analysis/*.java",
+ "multivalentTests/src/com/android/launcher3/testcomponent/BaseTestingActivity.java",
+ "multivalentTests/src/com/android/launcher3/testcomponent/OtherBaseTestingActivity.java",
+ "multivalentTests/src/com/android/launcher3/testcomponent/CustomShortcutConfigActivity.java",
+ "multivalentTests/src/com/android/launcher3/testcomponent/TestCommandReceiver.java",
+ "multivalentTests/src/com/android/launcher3/testcomponent/TestLauncherActivity.java",
+ "multivalentTests/src/com/android/launcher3/testcomponent/ImeTestActivity.java",
],
}
// Library with all the dependencies for building quickstep
android_library {
name: "Launcher3TestLib",
- srcs: [ ],
+ srcs: [],
asset_dirs: ["assets"],
resource_dirs: ["res"],
static_libs: [
@@ -130,11 +130,15 @@
],
manifest: "AndroidManifest-common.xml",
platform_apis: true,
+ // TODO(b/319712088): re-enable use_resource_processor
+ use_resource_processor: false,
}
android_library {
name: "Launcher3TestResources",
resource_dirs: ["res"],
+ // TODO(b/319712088): re-enable use_resource_processor
+ use_resource_processor: false,
}
android_test {
@@ -171,24 +175,24 @@
android_library {
name: "launcher-testing-shared",
srcs: [
- "multivalentTests/shared/com/android/launcher3/testing/shared/**/*.java"
+ "multivalentTests/shared/com/android/launcher3/testing/shared/**/*.java",
],
- resource_dirs: [ ],
+ resource_dirs: [],
manifest: "multivalentTests/shared/AndroidManifest.xml",
sdk_version: "current",
min_sdk_version: min_launcher3_sdk_version,
- }
+}
filegroup {
name: "launcher-testing-helpers",
srcs: [
- "src/**/*.java",
- "src/**/*.kt",
- "multivalentTests/src/**/*.java",
- "multivalentTests/src/**/*.kt",
- "multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java",
- "multivalentTests/tapl/com/android/launcher3/tapl/*.java",
- "multivalentTests/tapl/com/android/launcher3/tapl/*.kt",
+ "src/**/*.java",
+ "src/**/*.kt",
+ "multivalentTests/src/**/*.java",
+ "multivalentTests/src/**/*.kt",
+ "multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java",
+ "multivalentTests/tapl/com/android/launcher3/tapl/*.java",
+ "multivalentTests/tapl/com/android/launcher3/tapl/*.kt",
],
exclude_srcs: [
// Test classes
@@ -209,6 +213,8 @@
static_libs: [
"Launcher3CommonDepsLib",
],
+ // TODO(b/319712088): re-enable use_resource_processor
+ use_resource_processor: false,
}
android_robolectric_test {