diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-23 14:20:13 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-23 14:20:13 -0400 |
| commit | 60ecb9db9f17d11f0be3ad9405753c334deaad60 (patch) | |
| tree | b33b93fc01428bf5427462693658ce490166da5d /standalone | |
| parent | 5413945f0aa2b9ae3e567c540672fe80224d6c68 (diff) | |
move stuff into .android
This simplifies my schroot bind mounts
Diffstat (limited to 'standalone')
| -rw-r--r-- | standalone/android/Makefile | 6 | ||||
| -rwxr-xr-x | standalone/android/buildchroot-inchroot-asuser | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/standalone/android/Makefile b/standalone/android/Makefile index 5084ff5e8..4d15bc38b 100644 --- a/standalone/android/Makefile +++ b/standalone/android/Makefile @@ -6,12 +6,12 @@ ANDROID_CROSS_COMPILER?=$(HOME)/.ghc/android-14/arm-linux-androideabi-4.7/bin PATH:=$(ANDROID_CROSS_COMPILER):$(PATH) # Paths to the Android SDK and NDK. -export ANDROID_SDK_ROOT?=$(HOME)/adt-bundle-linux-x86/sdk -export ANDROID_NDK_ROOT?=$(HOME)/android-ndk +export ANDROID_SDK_ROOT?=$(HOME)/.android/adt-bundle-linux-x86/sdk +export ANDROID_NDK_ROOT?=$(HOME)/.android/android-ndk # Where to store the source tree used to build utilities. This # directory will be created by `make source`. -GIT_ANNEX_ANDROID_SOURCETREE?=$(HOME)/android-sourcetree +GIT_ANNEX_ANDROID_SOURCETREE?=$(HOME)/.android/git-annex-sourcetree GITTREE=$(GIT_ANNEX_ANDROID_SOURCETREE)/git/installed-tree diff --git a/standalone/android/buildchroot-inchroot-asuser b/standalone/android/buildchroot-inchroot-asuser index fbd6cc1bf..2cd77b6b7 100755 --- a/standalone/android/buildchroot-inchroot-asuser +++ b/standalone/android/buildchroot-inchroot-asuser @@ -8,6 +8,8 @@ cabal update cabal install happy alex --bindir=$HOME/bin PATH=$HOME/bin:$PATH export PATH +mkdir -p .android +cd .android git clone https://github.com/joeyh/ghc-android cd ghc-android git checkout stable-ghc-snapshot @@ -30,6 +32,7 @@ rm -rf adt-bundle-linux-x86/eclipse ln -s arm-linux-androideabi-gcc \ $HOME/.ghc/android-14/arm-linux-androideabi-4.7/bin/cc +cd git clone git://git-annex.branchable.com/ git-annex git config --global user.email androidbuilder@example.com |