commit eca7a079412cee02f90ebd131ea646dda532e280
author Aurimas Liutikas <aurimas@google.com> Tue Jul 11 01:11:52 2017 +0000
committer Aurimas Liutikas <aurimas@google.com> Tue Jul 11 01:11:52 2017 +0000
tree af66e90e09b66516d568b64a9633fbf010ed5cfa
parent deab65fbcc8b678ce31078a32e059612a77abe51

Revert "Move to using Doclava and Jdiff as composite builds."

This broke the build.

This reverts commit deab65fbcc8b678ce31078a32e059612a77abe51.

Change-Id: I70259aceaa408809f4a2055d8677cea5641cfc16

settings.gradle

diff --git a/settings.gradle b/settings.gradle
index 892a7ef..ffc34ee 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -170,9 +170,11 @@
 
 File externalRoot = new File(rootDir, '../../external')
 
-includeBuild new File(externalRoot, 'doclava')
+include ':doclava'
+project(':doclava').projectDir = new File(externalRoot, 'doclava')
 
-includeBuild new File(externalRoot, 'jdiff')
+include ':jdiff'
+project(':jdiff').projectDir = new File(externalRoot, 'jdiff')
 
 include ':noto-emoji-compat'
 project(':noto-emoji-compat').projectDir = new File(externalRoot, 'noto-fonts/emoji-compat')