Merge "Merge cherrypicks of [1982993] into androidx-compose-release." into androidx-compose-releasesnap-temp-L11300000953056382

2 files changed, 120 insertions, 120 deletions

diff --git a/docs-tip-of-tree/build.gradle b/docs-tip-of-tree/build.gradle
index 2a10f856e03..abde826f815 100644
--- a/docs-tip-of-tree/build.gradle
+++ b/docs-tip-of-tree/build.gradle
@@ -32,13 +32,13 @@ dependencies {
     docs(project(":biometric:biometric-ktx"))
     samples(project(":biometric:biometric-ktx-samples"))
     docs(project(":browser:browser"))
-    docs(project(":camera:camera-camera2"))
-    docs(project(":camera:camera-core"))
-    docs(project(":camera:camera-extensions"))
-    stubs(fileTree(dir: "../camera/camera-extensions-stub", include: ["camera-extensions-stub.jar"]))
-    docs(project(":camera:camera-lifecycle"))
-    docs(project(":camera:camera-video"))
-    docs(project(":camera:camera-view"))
+    // docs(project(":camera:camera-camera2"))
+    // docs(project(":camera:camera-core"))
+    // docs(project(":camera:camera-extensions"))
+    // stubs(fileTree(dir: "../camera/camera-extensions-stub", include: ["camera-extensions-stub.jar"]))
+    // docs(project(":camera:camera-lifecycle"))
+    // docs(project(":camera:camera-video"))
+    // docs(project(":camera:camera-view"))
     docs(project(":car:app:app"))
     docs(project(":car:app:app-automotive"))
     docs(project(":car:app:app-projected"))
@@ -135,9 +135,9 @@ dependencies {
     docs(project(":fragment:fragment"))
     docs(project(":fragment:fragment-ktx"))
     docs(project(":fragment:fragment-testing"))
-    docs(project(":glance:glance"))
-    docs(project(":glance:glance-appwidget"))
-    docs(project(":glance:glance-wear-tiles"))
+    // docs(project(":glance:glance"))
+    // docs(project(":glance:glance-appwidget"))
+    // docs(project(":glance:glance-wear-tiles"))
     docs(project(":gridlayout:gridlayout"))
     docs(project(":health:health-services-client"))
     docs(project(":heifwriter:heifwriter"))
@@ -259,36 +259,36 @@ dependencies {
     docs(project(":versionedparcelable:versionedparcelable"))
     docs(project(":viewpager2:viewpager2"))
     docs(project(":viewpager:viewpager"))
-    docs(project(":wear:wear"))
-    stubs(fileTree(dir: "../wear/wear_stubs/", include: ["com.google.android.wearable-stubs.jar"]))
-    docs(project(":wear:compose:compose-foundation"))
-    samples(project(":wear:compose:compose-foundation-samples"))
-    docs(project(":wear:compose:compose-material"))
-    samples(project(":wear:compose:compose-material-samples"))
-    docs(project(":wear:wear-input"))
-    docs(project(":wear:wear-input-testing"))
-    samples(project(":wear:wear-input-samples"))
-    docs(project(":wear:wear-ongoing"))
-    docs(project(":wear:wear-phone-interactions"))
-    docs(project(":wear:wear-remote-interactions"))
-    docs(project(":wear:tiles:tiles"))
-    docs(project(":wear:tiles:tiles-proto"))
-    docs(project(":wear:tiles:tiles-renderer"))
-    docs(project(":wear:watchface:watchface"))
-    docs(project(":wear:watchface:watchface-complications"))
-    docs(project(":wear:watchface:watchface-complications-data"))
-    docs(project(":wear:watchface:watchface-complications-data-source"))
-    samples(project(":wear:watchface:watchface-complications-data-source-samples"))
-    docs(project(":wear:watchface:watchface-complications-rendering"))
-    docs(project(":wear:watchface:watchface-client"))
-    docs(project(":wear:watchface:watchface-client-guava"))
-    docs(project(":wear:watchface:watchface-data"))
-    docs(project(":wear:watchface:watchface-editor"))
-    docs(project(":wear:watchface:watchface-editor-guava"))
-    docs(project(":wear:watchface:watchface-editor-samples"))
-    docs(project(":wear:watchface:watchface-guava"))
-    samples(project(":wear:watchface:watchface-samples"))
-    docs(project(":wear:watchface:watchface-style"))
+    // docs(project(":wear:wear"))
+    // stubs(fileTree(dir: "../wear/wear_stubs/", include: ["com.google.android.wearable-stubs.jar"]))
+    // docs(project(":wear:compose:compose-foundation"))
+    // samples(project(":wear:compose:compose-foundation-samples"))
+    // docs(project(":wear:compose:compose-material"))
+    // samples(project(":wear:compose:compose-material-samples"))
+    // docs(project(":wear:wear-input"))
+    // docs(project(":wear:wear-input-testing"))
+    // samples(project(":wear:wear-input-samples"))
+    // docs(project(":wear:wear-ongoing"))
+    // docs(project(":wear:wear-phone-interactions"))
+    // docs(project(":wear:wear-remote-interactions"))
+    // docs(project(":wear:tiles:tiles"))
+    // docs(project(":wear:tiles:tiles-proto"))
+    // docs(project(":wear:tiles:tiles-renderer"))
+    // docs(project(":wear:watchface:watchface"))
+    // docs(project(":wear:watchface:watchface-complications"))
+    // docs(project(":wear:watchface:watchface-complications-data"))
+    // docs(project(":wear:watchface:watchface-complications-data-source"))
+    // samples(project(":wear:watchface:watchface-complications-data-source-samples"))
+    // docs(project(":wear:watchface:watchface-complications-rendering"))
+    // docs(project(":wear:watchface:watchface-client"))
+    // docs(project(":wear:watchface:watchface-client-guava"))
+    // docs(project(":wear:watchface:watchface-data"))
+    // docs(project(":wear:watchface:watchface-editor"))
+    // docs(project(":wear:watchface:watchface-editor-guava"))
+    // docs(project(":wear:watchface:watchface-editor-samples"))
+    // docs(project(":wear:watchface:watchface-guava"))
+    // samples(project(":wear:watchface:watchface-samples"))
+    // docs(project(":wear:watchface:watchface-style"))
     docs(project(":webkit:webkit"))
     docs(project(":window:window"))
     docs(project(":window:window-java"))
diff --git a/settings.gradle b/settings.gradle
index 49b009325e1..8c068c0fa79 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -279,24 +279,24 @@ if (startParameter.projectProperties.containsKey("androidx.useMaxDepVersions"))
     includeProject(":buildSrc-tests:max-dep-versions:buildSrc-tests-max-dep-versions-main", "buildSrc-tests/max-dep-versions/buildSrc-tests-max-dep-versions-main", [BuildType.MAIN])
 }
 includeProject(":buildSrc-tests:project-subsets", "buildSrc-tests/project-subsets", [BuildType.MAIN])
-includeProject(":camera:camera-camera2", "camera/camera-camera2", [BuildType.MAIN])
-includeProject(":camera:camera-camera2-pipe", "camera/camera-camera2-pipe", [BuildType.MAIN])
-includeProject(":camera:camera-camera2-pipe-integration", "camera/camera-camera2-pipe-integration", [BuildType.MAIN])
-includeProject(":camera:camera-camera2-pipe-testing", "camera/camera-camera2-pipe-testing", [BuildType.MAIN])
-includeProject(":camera:camera-core", "camera/camera-core", [BuildType.MAIN])
-includeProject(":camera:camera-extensions", "camera/camera-extensions", [BuildType.MAIN])
-includeProject(":camera:camera-extensions-stub", "camera/camera-extensions-stub", [BuildType.MAIN])
-includeProject(":camera:camera-lifecycle", "camera/camera-lifecycle", [BuildType.MAIN])
-includeProject(":camera:camera-testing", "camera/camera-testing", [BuildType.MAIN])
-includeProject(":camera:camera-video", "camera/camera-video", [BuildType.MAIN])
-includeProject(":camera:camera-view", "camera/camera-view", [BuildType.MAIN])
-includeProject(":camera:integration-tests:camera-testapp-camera2-pipe", "camera/integration-tests/camerapipetestapp", [BuildType.MAIN])
-includeProject(":camera:integration-tests:camera-testapp-core", "camera/integration-tests/coretestapp", [BuildType.MAIN])
-includeProject(":camera:integration-tests:camera-testapp-extensions", "camera/integration-tests/extensionstestapp", [BuildType.MAIN])
-includeProject(":camera:integration-tests:camera-testapp-timing", "camera/integration-tests/timingtestapp", [BuildType.MAIN])
-includeProject(":camera:integration-tests:camera-testapp-uiwidgets", "camera/integration-tests/uiwidgetstestapp", [BuildType.MAIN])
-includeProject(":camera:integration-tests:camera-testapp-view", "camera/integration-tests/viewtestapp", [BuildType.MAIN])
-includeProject(":camera:camera-testlib-extensions", "camera/camera-testlib-extensions", [BuildType.MAIN])
+// includeProject(":camera:camera-camera2", "camera/camera-camera2", [BuildType.MAIN])
+// includeProject(":camera:camera-camera2-pipe", "camera/camera-camera2-pipe", [BuildType.MAIN])
+// includeProject(":camera:camera-camera2-pipe-integration", "camera/camera-camera2-pipe-integration", [BuildType.MAIN])
+// includeProject(":camera:camera-camera2-pipe-testing", "camera/camera-camera2-pipe-testing", [BuildType.MAIN])
+// includeProject(":camera:camera-core", "camera/camera-core", [BuildType.MAIN])
+// includeProject(":camera:camera-extensions", "camera/camera-extensions", [BuildType.MAIN])
+// includeProject(":camera:camera-extensions-stub", "camera/camera-extensions-stub", [BuildType.MAIN])
+// includeProject(":camera:camera-lifecycle", "camera/camera-lifecycle", [BuildType.MAIN])
+// includeProject(":camera:camera-testing", "camera/camera-testing", [BuildType.MAIN])
+// includeProject(":camera:camera-video", "camera/camera-video", [BuildType.MAIN])
+// includeProject(":camera:camera-view", "camera/camera-view", [BuildType.MAIN])
+// includeProject(":camera:integration-tests:camera-testapp-camera2-pipe", "camera/integration-tests/camerapipetestapp", [BuildType.MAIN])
+// includeProject(":camera:integration-tests:camera-testapp-core", "camera/integration-tests/coretestapp", [BuildType.MAIN])
+// includeProject(":camera:integration-tests:camera-testapp-extensions", "camera/integration-tests/extensionstestapp", [BuildType.MAIN])
+// includeProject(":camera:integration-tests:camera-testapp-timing", "camera/integration-tests/timingtestapp", [BuildType.MAIN])
+// includeProject(":camera:integration-tests:camera-testapp-uiwidgets", "camera/integration-tests/uiwidgetstestapp", [BuildType.MAIN])
+// includeProject(":camera:integration-tests:camera-testapp-view", "camera/integration-tests/viewtestapp", [BuildType.MAIN])
+// includeProject(":camera:camera-testlib-extensions", "camera/camera-testlib-extensions", [BuildType.MAIN])
 includeProject(":car:app:app", "car/app/app", [BuildType.MAIN])
 includeProject(":car:app:app-automotive", "car/app/app-automotive", [BuildType.MAIN])
 includeProject(":car:app:app-projected", "car/app/app-projected", [BuildType.MAIN])
@@ -497,12 +497,12 @@ includeProject(":fragment:fragment-testing", "fragment/fragment-testing", [Build
 includeProject(":fragment:fragment-testing-lint", "fragment/fragment-testing-lint", [BuildType.MAIN, BuildType.FLAN])
 includeProject(":fragment:fragment-truth", "fragment/fragment-truth", [BuildType.MAIN, BuildType.FLAN])
 includeProject(":fragment:integration-tests:testapp", "fragment/integration-tests/testapp", [BuildType.MAIN, BuildType.FLAN])
-includeProject(":glance:glance", "glance/glance", [BuildType.MAIN])
-includeProject(":glance:glance-appwidget", "glance/glance-appwidget", [BuildType.MAIN])
-includeProject(":glance:glance-appwidget-proto", "glance/glance-appwidget-proto", [BuildType.MAIN])
-includeProject(":glance:glance-appwidget:integration-tests:demos", "glance/glance-appwidget/integration-tests/demos", [BuildType.MAIN])
-includeProject(":glance:glance-appwidget:glance-layout-generator", "glance/glance-appwidget/glance-layout-generator", [BuildType.MAIN])
-includeProject(":glance:glance-wear-tiles", "glance/glance-wear-tiles", [BuildType.MAIN])
+// includeProject(":glance:glance", "glance/glance", [BuildType.MAIN])
+// includeProject(":glance:glance-appwidget", "glance/glance-appwidget", [BuildType.MAIN])
+// includeProject(":glance:glance-appwidget-proto", "glance/glance-appwidget-proto", [BuildType.MAIN])
+// includeProject(":glance:glance-appwidget:integration-tests:demos", "glance/glance-appwidget/integration-tests/demos", [BuildType.MAIN])
+// includeProject(":glance:glance-appwidget:glance-layout-generator", "glance/glance-appwidget/glance-layout-generator", [BuildType.MAIN])
+// includeProject(":glance:glance-wear-tiles", "glance/glance-wear-tiles", [BuildType.MAIN])
 includeProject(":gridlayout:gridlayout", "gridlayout/gridlayout", [BuildType.MAIN])
 includeProject(":health:health-services-client", "health/health-services-client", [BuildType.MAIN])
 includeProject(":heifwriter:heifwriter", "heifwriter/heifwriter", [BuildType.MAIN])
@@ -694,51 +694,51 @@ includeProject(":viewpager2:integration-tests:testapp", "viewpager2/integration-
 includeProject(":viewpager2:integration-tests:targetsdk-tests", "viewpager2/integration-tests/targetsdk-tests", [BuildType.MAIN])
 includeProject(":viewpager2:viewpager2", "viewpager2/viewpager2", [BuildType.MAIN])
 includeProject(":viewpager:viewpager", "viewpager/viewpager", [BuildType.MAIN])
-includeProject(":wear:wear", "wear/wear", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:benchmark:integration-tests:macrobenchmark-target", "wear/benchmark/integration-tests/macrobenchmark-target", [BuildType.MAIN, BuildType.COMPOSE])
-includeProject(":wear:benchmark:integration-tests:macrobenchmark", "wear/benchmark/integration-tests/macrobenchmark", [BuildType.MAIN, BuildType.COMPOSE])
-includeProject(":wear:compose:compose-foundation", "wear/compose/compose-foundation", [BuildType.COMPOSE])
-includeProject(":wear:compose:compose-foundation-samples", "wear/compose/compose-foundation/samples", [BuildType.COMPOSE])
-includeProject(":wear:compose:compose-material", "wear/compose/compose-material", [BuildType.COMPOSE])
-includeProject(":wear:compose:compose-material-benchmark", "wear/compose/compose-material/benchmark", [BuildType.COMPOSE])
-includeProject(":wear:compose:compose-material-samples", "wear/compose/compose-material/samples", [BuildType.COMPOSE])
-includeProject(":wear:compose:compose-navigation", "wear/compose/compose-navigation", [BuildType.COMPOSE])
-includeProject(":wear:compose:integration-tests:demos", "wear/compose/integration-tests/demos", [BuildType.COMPOSE])
-includeProject(":wear:compose:integration-tests:macrobenchmark", "wear/compose/integration-tests/macrobenchmark", [BuildType.COMPOSE])
-includeProject(":wear:compose:integration-tests:macrobenchmark-target", "wear/compose/integration-tests/macrobenchmark-target", [BuildType.COMPOSE])
-includeProject(":wear:compose:integration-tests:navigation", "wear/compose/integration-tests/navigation", [BuildType.COMPOSE])
-includeProject(":wear:wear-input", "wear/wear-input", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:wear-input-samples", "wear/wear-input/samples", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:wear-input-testing", "wear/wear-input-testing", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:wear-ongoing", "wear/wear-ongoing", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:wear-phone-interactions", "wear/wear-phone-interactions", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:wear-remote-interactions", "wear/wear-remote-interactions", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:wear-samples-ambient", "wear/wear-samples-ambient", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:tiles:tiles", "wear/tiles/tiles", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:tiles:tiles-proto", "wear/tiles/tiles-proto", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:tiles:tiles-renderer", "wear/tiles/tiles-renderer", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:tiles:tiles-testing", "wear/tiles/tiles-testing", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface", "wear/watchface/watchface", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-complications", "wear/watchface/watchface-complications", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-complications-permission-dialogs-sample", "wear/watchface/watchface-complications-permission-dialogs-sample", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-complications-data", "wear/watchface/watchface-complications-data", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-complications-data-source", "wear/watchface/watchface-complications-data-source", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-complications-data-source-ktx", "wear/watchface/watchface-complications-data-source-ktx", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-complications-data-source-samples", "wear/watchface/watchface-complications-data-source-samples", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-complications-rendering", "wear/watchface/watchface-complications-rendering", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-client", "wear/watchface/watchface-client", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-client-guava", "wear/watchface/watchface-client-guava", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-data", "wear/watchface/watchface-data", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-editor", "wear/watchface/watchface-editor", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-editor-guava", "wear/watchface/watchface-editor-guava", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-editor-samples", "wear/watchface/watchface-editor/samples", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-guava", "wear/watchface/watchface-guava", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-samples", "wear/watchface/watchface/samples", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-samples-app", "wear/watchface/watchface/samples/app", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-samples-minimal", "wear/watchface/watchface/samples/minimal", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-samples-minimal-complications", "wear/watchface/watchface-samples-minimal-complications", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-samples-minimal-style", "wear/watchface/watchface-samples-minimal-style", [BuildType.MAIN, BuildType.WEAR])
-includeProject(":wear:watchface:watchface-style", "wear/watchface/watchface-style", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:wear", "wear/wear", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:benchmark:integration-tests:macrobenchmark-target", "wear/benchmark/integration-tests/macrobenchmark-target", [BuildType.MAIN, BuildType.COMPOSE])
+// includeProject(":wear:benchmark:integration-tests:macrobenchmark", "wear/benchmark/integration-tests/macrobenchmark", [BuildType.MAIN, BuildType.COMPOSE])
+// includeProject(":wear:compose:compose-foundation", "wear/compose/compose-foundation", [BuildType.COMPOSE])
+// includeProject(":wear:compose:compose-foundation-samples", "wear/compose/compose-foundation/samples", [BuildType.COMPOSE])
+// includeProject(":wear:compose:compose-material", "wear/compose/compose-material", [BuildType.COMPOSE])
+// includeProject(":wear:compose:compose-material-benchmark", "wear/compose/compose-material/benchmark", [BuildType.COMPOSE])
+// includeProject(":wear:compose:compose-material-samples", "wear/compose/compose-material/samples", [BuildType.COMPOSE])
+// includeProject(":wear:compose:compose-navigation", "wear/compose/compose-navigation", [BuildType.COMPOSE])
+// includeProject(":wear:compose:integration-tests:demos", "wear/compose/integration-tests/demos", [BuildType.COMPOSE])
+// includeProject(":wear:compose:integration-tests:macrobenchmark", "wear/compose/integration-tests/macrobenchmark", [BuildType.COMPOSE])
+// includeProject(":wear:compose:integration-tests:macrobenchmark-target", "wear/compose/integration-tests/macrobenchmark-target", [BuildType.COMPOSE])
+// includeProject(":wear:compose:integration-tests:navigation", "wear/compose/integration-tests/navigation", [BuildType.COMPOSE])
+// includeProject(":wear:wear-input", "wear/wear-input", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:wear-input-samples", "wear/wear-input/samples", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:wear-input-testing", "wear/wear-input-testing", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:wear-ongoing", "wear/wear-ongoing", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:wear-phone-interactions", "wear/wear-phone-interactions", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:wear-remote-interactions", "wear/wear-remote-interactions", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:wear-samples-ambient", "wear/wear-samples-ambient", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:tiles:tiles", "wear/tiles/tiles", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:tiles:tiles-proto", "wear/tiles/tiles-proto", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:tiles:tiles-renderer", "wear/tiles/tiles-renderer", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:tiles:tiles-testing", "wear/tiles/tiles-testing", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface", "wear/watchface/watchface", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-complications", "wear/watchface/watchface-complications", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-complications-permission-dialogs-sample", "wear/watchface/watchface-complications-permission-dialogs-sample", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-complications-data", "wear/watchface/watchface-complications-data", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-complications-data-source", "wear/watchface/watchface-complications-data-source", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-complications-data-source-ktx", "wear/watchface/watchface-complications-data-source-ktx", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-complications-data-source-samples", "wear/watchface/watchface-complications-data-source-samples", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-complications-rendering", "wear/watchface/watchface-complications-rendering", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-client", "wear/watchface/watchface-client", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-client-guava", "wear/watchface/watchface-client-guava", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-data", "wear/watchface/watchface-data", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-editor", "wear/watchface/watchface-editor", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-editor-guava", "wear/watchface/watchface-editor-guava", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-editor-samples", "wear/watchface/watchface-editor/samples", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-guava", "wear/watchface/watchface-guava", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-samples", "wear/watchface/watchface/samples", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-samples-app", "wear/watchface/watchface/samples/app", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-samples-minimal", "wear/watchface/watchface/samples/minimal", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-samples-minimal-complications", "wear/watchface/watchface-samples-minimal-complications", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-samples-minimal-style", "wear/watchface/watchface-samples-minimal-style", [BuildType.MAIN, BuildType.WEAR])
+// includeProject(":wear:watchface:watchface-style", "wear/watchface/watchface-style", [BuildType.MAIN, BuildType.WEAR])
 includeProject(":webkit:integration-tests:testapp", "webkit/integration-tests/testapp", [BuildType.MAIN])
 includeProject(":webkit:webkit", "webkit/webkit", [BuildType.MAIN])
 includeProject(":window:window", "window/window", [BuildType.MAIN, BuildType.FLAN])
@@ -771,17 +771,17 @@ File samplesRoot = new File(rootDir, "samples")
 
 // Note: don't add new samples/ apps. Instead, Create
 // <module>/integration-tests/testapp in the "Libraries" section above.
-includeProject(":support-animation-demos", new File(samplesRoot, "SupportAnimationDemos"), [BuildType.MAIN])
-includeProject(":support-content-demos", new File(samplesRoot, "SupportContentDemos"), [BuildType.MAIN])
-includeProject(":support-emoji-demos", new File(samplesRoot, "SupportEmojiDemos"), [BuildType.MAIN])
-includeProject(":support-leanback-demos", new File(samplesRoot, "SupportLeanbackDemos"), [BuildType.MAIN])
-includeProject(":support-preference-demos", new File(samplesRoot, "SupportPreferenceDemos"), [BuildType.MAIN])
-includeProject(":support-remotecallback-demos", new File(samplesRoot, "SupportRemoteCallbackDemos"), [BuildType.MAIN])
-includeProject(":support-slices-demos", new File(samplesRoot, "SupportSliceDemos"), [BuildType.MAIN])
-includeProject(":support-transition-demos", new File(samplesRoot, "SupportTransitionDemos"), [BuildType.MAIN])
-includeProject(":support-v4-demos", new File(samplesRoot, "Support4Demos"), [BuildType.MAIN])
-includeProject(":support-v7-demos", new File(samplesRoot, "Support7Demos"), [BuildType.MAIN])
-includeProject(":support-wear-demos", new File(samplesRoot, "SupportWearDemos"), [BuildType.MAIN])
+// includeProject(":support-animation-demos", new File(samplesRoot, "SupportAnimationDemos"), [BuildType.MAIN])
+// includeProject(":support-content-demos", new File(samplesRoot, "SupportContentDemos"), [BuildType.MAIN])
+// includeProject(":support-emoji-demos", new File(samplesRoot, "SupportEmojiDemos"), [BuildType.MAIN])
+// includeProject(":support-leanback-demos", new File(samplesRoot, "SupportLeanbackDemos"), [BuildType.MAIN])
+// includeProject(":support-preference-demos", new File(samplesRoot, "SupportPreferenceDemos"), [BuildType.MAIN])
+// includeProject(":support-remotecallback-demos", new File(samplesRoot, "SupportRemoteCallbackDemos"), [BuildType.MAIN])
+// includeProject(":support-slices-demos", new File(samplesRoot, "SupportSliceDemos"), [BuildType.MAIN])
+// includeProject(":support-transition-demos", new File(samplesRoot, "SupportTransitionDemos"), [BuildType.MAIN])
+// includeProject(":support-v4-demos", new File(samplesRoot, "Support4Demos"), [BuildType.MAIN])
+// includeProject(":support-v7-demos", new File(samplesRoot, "Support7Demos"), [BuildType.MAIN])
+// includeProject(":support-wear-demos", new File(samplesRoot, "SupportWearDemos"), [BuildType.MAIN])
 
 /////////////////////////////
 //