commit d1a118589a7b92a76d94c0d41a051f91da570a24
author Morten Krogh-Jespersen <mkroghj@google.com> Wed Jun 14 14:48:44 2023 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Wed Jun 14 12:49:41 2023 +0000
tree b1013c0c9094f473abdb9b0edbd4531ed6b20a2d
parent 8925a2dfb1bfe26ee6ae42084755bd204d7aff99

Update new gradle setup to compile r8lib with and without dependencies

Bug: b/270105162
Change-Id: I1fd6f44e956805ea69094eb22c93effaf622cb18

d8_r8/test/settings.gradle.kts

diff --git a/d8_r8/test/settings.gradle.kts b/d8_r8/test/settings.gradle.kts
index 5946a12..5b00aae 100644
--- a/d8_r8/test/settings.gradle.kts
+++ b/d8_r8/test/settings.gradle.kts
@@ -3,23 +3,23 @@
 // BSD-style license that can be found in the LICENSE file.
 
 pluginManagement {
-    repositories {
-        maven {
-            url = uri("file:../../third_party/dependencies")
-        }
-        maven {
-            url = uri("file:../../third_party/dependencies_new")
-        }
+  repositories {
+    maven {
+      url = uri("file:../../third_party/dependencies")
     }
+    maven {
+      url = uri("file:../../third_party/dependencies_new")
+    }
+  }
 }
 
 dependencyResolutionManagement {
   repositories {
     maven {
-        url= uri("file:../third_party/dependencies")
+      url = uri("file:../../third_party/dependencies")
     }
     maven {
-        url= uri("file:../third_party/dependencies_new")
+      url = uri("file:../../third_party/dependencies_new")
     }
   }
 }
@@ -27,4 +27,5 @@
 rootProject.name = "r8-tests"
 
 val root = rootProject.projectDir.parentFile
+includeBuild(root.resolve("main"))
 includeBuild(root.resolve("test_modules").resolve("tests_java_8"))