Bug 1098444 - Add local.properties with sdk.dir for Gradle. r=trivial
authorNick Alexander <nalexander@mozilla.com>
Thu, 13 Nov 2014 15:35:27 -0800
changeset 215751 fcd73aacab8cfc5ed03d4f382db38376cffcbed6
parent 215750 acf1606913a8acec73c922c69743cac3f41f1b20
child 215752 19fdbc7ad82903de93feff80c83ac5aff5c3b97c
push id51845
push usercbook@mozilla.com
push dateFri, 14 Nov 2014 12:23:21 +0000
treeherdermozilla-inbound@da57927b609d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstrivial
bugs1098444
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1098444 - Add local.properties with sdk.dir for Gradle. r=trivial It's possible this could go in gradle.properties, but this is what's widely documented.
mobile/android/gradle/Makefile.in
mobile/android/gradle/local.properties.in
--- a/mobile/android/gradle/Makefile.in
+++ b/mobile/android/gradle/Makefile.in
@@ -1,19 +1,21 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 gradle := \
+  local.properties.in \
   gradle.properties.in \
   $(NULL)
 
 gradle_PATH := $(CURDIR)
 gradle_FLAGS += -Dtopsrcdir=$(abspath $(topsrcdir))
 gradle_FLAGS += -Dtopobjdir=$(abspath $(DEPTH))
+gradle_FLAGS += -DANDROID_SDK_ROOT=$(ANDROID_SDK_ROOT)
 gradle_KEEP_PATH := 1
 PP_TARGETS += gradle
 
 wrapper_FILES := \
   build.gradle \
   settings.gradle \
   gradle/wrapper/gradle-wrapper.jar \
   gradle/wrapper/gradle-wrapper.properties \
new file mode 100644
--- /dev/null
+++ b/mobile/android/gradle/local.properties.in
@@ -0,0 +1,2 @@
+#filter substitution
+sdk.dir=@ANDROID_SDK_ROOT@