status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Set JVM heap size in gradle.properties so that dex can run in-process 

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
This commit is contained in:
Pedro Pombeiro 2018-07-11 18:43:52 +02:00
parent 242c42ef3a
commit 2a6bb4cb8f
No known key found for this signature in database
GPG Key ID: A65DEB11E4BBC647
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/gradle.properties
View File

@ -30,3 +30,5 @@ android.enableAapt2=false
# Disable Gradle Daemon https://stackoverflow.com/questions/38710327/jenkins-builds-fail-using-the-gradle-daemon # Disable Gradle Daemon https://stackoverflow.com/questions/38710327/jenkins-builds-fail-using-the-gradle-daemon
org.gradle.daemon=false org.gradle.daemon=false
org.gradle.jvmargs=-Xmx4608M

10
scripts/lib/setup/installers.sh
View File

@ -1,5 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
_localPropertiesPath=./android/local.properties
function install_node() { function install_node() {
if nvm_installed; then if nvm_installed; then
install_node_via_nvm install_node_via_nvm
@ -294,15 +296,14 @@ function dependency_setup() {
} }
function use_android_sdk() { function use_android_sdk() {
_localPropertiesPath=./android/local.properties
if [ -n "$ANDROID_SDK" ]; then if [ -n "$ANDROID_SDK" ]; then
if ! grep -Fq "sdk.dir" $_localPropertiesPath; then if ! grep -Fq "sdk.dir" $_localPropertiesPath; then
echo "sdk.dir=$ANDROID_SDK" | tee -a $_localPropertiesPath echo "sdk.dir=$ANDROID_SDK" | tee -a $_localPropertiesPath
fi fi
else else
_docURL="https://docs.status.im/docs/build_status_linux.html" local _docUrl="https://docs.status.im/docs/build_status_linux.html"
if is_macos; then if is_macos; then
_docURL="https://docs.status.im/docs/build_status_osx.html" _docUrl="https://docs.status.im/docs/build_status_osx.html"
fi fi
cecho "@yellow[[ANDROID_SDK environment variable not defined, please install the Android SDK.]]" cecho "@yellow[[ANDROID_SDK environment variable not defined, please install the Android SDK.]]"
cecho "@yellow[[(see $_docUrl).]]" cecho "@yellow[[(see $_docUrl).]]"
@ -314,12 +315,11 @@ function use_android_sdk() {
} }
function install_android_ndk() { function install_android_ndk() {
_localPropertiesPath=./android/local.properties
if grep -Fq "ndk.dir" $_localPropertiesPath; then if grep -Fq "ndk.dir" $_localPropertiesPath; then
dependency_setup \ dependency_setup \
"pushd android && ./gradlew react-native-android:installArchives && popd" "pushd android && ./gradlew react-native-android:installArchives && popd"
else else
_ndkParentDir=~/Android/Sdk local _ndkParentDir=~/Android/Sdk
mkdir -p $_ndkParentDir mkdir -p $_ndkParentDir
cecho "@cyan[[Downloading Android NDK.]]" cecho "@cyan[[Downloading Android NDK.]]"
wget --output-document=android-ndk.zip https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip && \ wget --output-document=android-ndk.zip https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip && \