summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Falcone <asfalcone@google.com>2019-08-23 14:20:38 -0400
committerAndrea Falcone <asfalcone@google.com>2019-08-23 14:21:02 -0400
commitf4fa8e12ecbf1da48e126c6411a017e2a8e891a4 (patch)
treea34088e1069816323a9900be419c66b62489f34b
parent5f6e86d0797eb79838a68a0e113d551047ac5975 (diff)
downloadmanifest-f4fa8e12ecbf1da48e126c6411a017e2a8e891a4.tar.gz
Change location of ndk and cmake to be under fullsdk
because this is where studio/gradle will look for them relative to the sdk dir without additional configuration Change-Id: I2c78346cdb9a7604987d0db00127ab0efee1880c
-rw-r--r--default.xml10
1 files changed, 6 insertions, 4 deletions
diff --git a/default.xml b/default.xml
index 1d97ab83c..cf6d01ebe 100644
--- a/default.xml
+++ b/default.xml
@@ -57,11 +57,13 @@
<linkfile src="." dest="prebuilts/fullsdk-linux/sources/android-29" />
</project>
<project
- path="prebuilts/ndk"
+ path="prebuilts/fullsdk-darwin/ndk"
name="platform/prebuilts/ndk"
revision="master"
groups="pdk"
- clone-depth="1" />
+ clone-depth="1">
+ <linkfile src="." dest="prebuilts/fullsdk-linux/ndk" />
+ </project>
<!-- SDK dependencies (darwin) -->
<!-- Config: shallow + master revision -->
<project
@@ -83,7 +85,7 @@
clone-depth="1"
groups="notdefault,platform-darwin" />
<project
- path="prebuilts/cmake-darwin"
+ path="prebuilts/fullsdk-darwin/cmake"
name="platform/prebuilts/cmake/darwin-x86"
revision="master"
groups="notdefault,platform-darwin"
@@ -115,7 +117,7 @@
groups="pdk"
clone-depth="1" />
<project
- path="prebuilts/cmake-linux"
+ path="prebuilts/fullsdk-linux/cmake"
name="platform/prebuilts/cmake/linux-x86"
revision="master"
groups="notdefault,platform-linux"