make it buildable

SR1s · Jun 29, 2018 · a23529a · a23529a
1 parent 9791ac5
commit a23529a
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 34 deletions.
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -2,6 +2,8 @@ buildscript {
     def supportRootFolder = project.projectDir.getParentFile()
     apply from: "unbundled_check.gradle"
     repositories {
+        jcenter()
+        google()
         maven {
             url "${supportRootFolder}/../../prebuilts/tools/common/m2/repository"
         }

diff --git a/buildSrc/init.gradle b/buildSrc/init.gradle
@@ -43,18 +43,18 @@ ext.docs.dac = [
 ]
 
 def enableDoclavaAndJDiff(p) {
-    p.configurations {
-        doclava
-        jdiff
-    }
-
-    p.dependencies {
-        doclava project(':doclava')
-        jdiff project(':jdiff')
-        jdiff libs.xml_parser_apis
-        jdiff libs.xerces_impl
-    }
-    apply from: "${ext.supportRootFolder}/buildSrc/diff_and_docs.gradle"
+//    p.configurations {
+//        doclava
+//        jdiff
+//    }
+
+//    p.dependencies {
+//        doclava project(':doclava')
+//        jdiff project(':jdiff')
+//        jdiff libs.xml_parser_apis
+//        jdiff libs.xerces_impl
+//    }
+//    apply from: "${ext.supportRootFolder}/buildSrc/diff_and_docs.gradle"
 }
 
 def getFullSdkPath() {
@@ -121,13 +121,13 @@ def setSdkInLocalPropertiesFile() {
         props.write "sdk.dir=${fullSdkPath}"
         ext.usingFullSdk = true
     } else {
-        gradle.ext.currentSdk = 'current'
-        project.ext.androidJar = files("${repos.prebuiltsRoot}/sdk/current/android.jar")
+        gradle.ext.currentSdk = 26
+//        project.ext.androidJar = files("${repos.prebuiltsRoot}/sdk/current/android.jar")
         project.ext.androidSrcJar = null
         project.ext.androidApiTxt = file("${repos.prebuiltsRoot}/sdk/api/26.txt")
         System.setProperty('android.dir', "${supportRootFolder}/../../")
         File props = file("local.properties")
-        props.write "android.dir=../../"
+//        props.write "android.dir=../../"
         ext.usingFullSdk = false
     }
 }

diff --git a/buildSrc/repos.gradle b/buildSrc/repos.gradle
@@ -40,7 +40,7 @@ ext.repoNames = ["${repos.prebuiltsRoot}/gradle-plugin",
                  "${repos.prebuiltsRoot}/tools/common/m2/internal",
                  "${repos.prebuiltsRoot}/maven_repo/android",
                  "${getFullSdkPath(repos.prebuiltsRoot)}/extras/m2repository"]
-
+ext.repoNames = []
 /**
  * Adds maven repositories to the given repository handler.
  */
@@ -50,14 +50,14 @@ def addMavenRepositories(RepositoryHandler handler) {
             url repo
         }
     }
-    if (System.getenv("ALLOW_PUBLIC_REPOS") != null || (isUnbundledBuild(ext.supportRootFolder))) {
+//    if (System.getenv("ALLOW_PUBLIC_REPOS") != null || (isUnbundledBuild(ext.supportRootFolder))) {
         handler.mavenCentral()
         handler.jcenter()
         handler.google()
         handler.maven {
             url "https://plugins.gradle.org/m2/"
         }
-    }
+//    }
     def androidPluginRepoOverride = System.getenv("GRADLE_PLUGIN_REPO")
     if (androidPluginRepoOverride != null) {
         handler.maven {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,6 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=../../../../tools/external/gradle/gradle-4.4-bin.zip
+
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+#distributionUrl=../../../../tools/external/gradle/gradle-4.4-bin.zip
diff --git a/settings.gradle b/settings.gradle
@@ -91,14 +91,14 @@ project(':wear').projectDir = new File(rootDir, 'wear')
 include ':support-tv-provider'
 project(':support-tv-provider').projectDir = new File(rootDir, 'tv-provider')
 
-include ':support-emoji'
-project(':support-emoji').projectDir = new File(rootDir, 'emoji/core')
+//include ':support-emoji'
+//project(':support-emoji').projectDir = new File(rootDir, 'emoji/core')
 
-include ':support-emoji-bundled'
-project(':support-emoji-bundled').projectDir = new File(rootDir, 'emoji/bundled')
+//include ':support-emoji-bundled'
+//project(':support-emoji-bundled').projectDir = new File(rootDir, 'emoji/bundled')
 
-include ':support-emoji-appcompat'
-project(':support-emoji-appcompat').projectDir = new File(rootDir, 'emoji/appcompat')
+//include ':support-emoji-appcompat'
+//project(':support-emoji-appcompat').projectDir = new File(rootDir, 'emoji/appcompat')
 
 include ':support-content'
 project(':support-content').projectDir = new File(rootDir, 'content')
@@ -153,8 +153,8 @@ project(':support-wear-demos').projectDir = new File(samplesRoot, 'SupportWearDe
 include ':support-app-navigation'
 project(':support-app-navigation').projectDir = new File(samplesRoot, 'SupportAppNavigation')
 
-include ':support-emoji-demos'
-project(':support-emoji-demos').projectDir = new File(samplesRoot, 'SupportEmojiDemos')
+//include ':support-emoji-demos'
+//project(':support-emoji-demos').projectDir = new File(samplesRoot, 'SupportEmojiDemos')
 
 /////////////////////////////
 //
@@ -186,16 +186,16 @@ project(':support-media-compat-test-lib').projectDir = new File(rootDir, 'media-
 //
 /////////////////////////////
 
-File externalRoot = new File(rootDir, '../../external')
+//File externalRoot = new File(rootDir, '../../external')
 
-include ':doclava'
-project(':doclava').projectDir = new File(externalRoot, 'doclava')
+//include ':doclava'
+//project(':doclava').projectDir = new File(externalRoot, 'doclava')
 
-include ':jdiff'
-project(':jdiff').projectDir = 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')
+//include ':noto-emoji-compat'
+//project(':noto-emoji-compat').projectDir = new File(externalRoot, 'noto-fonts/emoji-compat')
 
 ///// FLATFOOT START