Fix ordering of included projects in settings.gradle
A previous commit had a graphics module out of place to work around
an automerger/presubmit failure. This CL fixes that ordering to
what it should be.
Bug: 274500653
Test: builds, runs, passes presubmit including automerger
Change-Id: Iacdadd9257efc6b82d7a39e779ee0c66d3f5795a
diff --git a/settings.gradle b/settings.gradle
index d573716..10ad43d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -697,6 +697,7 @@
includeProject(":graphics:graphics-core", [BuildType.MAIN])
includeProject(":graphics:graphics-shapes", [BuildType.MAIN, BuildType.COMPOSE])
includeProject(":graphics:integration-tests:testapp", [BuildType.MAIN])
+includeProject(":graphics:integration-tests:testapp-compose", [BuildType.COMPOSE])
includeProject(":gridlayout:gridlayout", [BuildType.MAIN])
includeProject(":health:connect:connect-client", [BuildType.MAIN])
includeProject(":health:connect:connect-client-proto", [BuildType.MAIN])
@@ -1015,8 +1016,6 @@
includeProject(":work:work-rxjava2", [BuildType.MAIN])
includeProject(":work:work-rxjava3", [BuildType.MAIN])
includeProject(":work:work-testing", [BuildType.MAIN])
-// TODO(274500653): reorder correctly in a follow up CL. Correct ordering confuses the automerger.
-includeProject(":graphics:integration-tests:testapp-compose", [BuildType.COMPOSE])
/////////////////////////////
//
