Merge branch '4.4-kitkat' into 5.0-lollipop

This commit is contained in:
Kyle Manna 2015-04-22 10:16:00 -07:00
commit bf49b4a69c

View File

@ -26,7 +26,7 @@ if [ "$1" = "docker" ]; then
make -j $cpus make -j $cpus
else else
aosp_url="https://raw.githubusercontent.com/kylemanna/docker-aosp/master/utils/aosp" aosp_url="https://raw.githubusercontent.com/kylemanna/docker-aosp/master/utils/aosp"
args="run.sh docker" args="bash run.sh docker"
export AOSP_EXTRA_ARGS="-v $(cd $(dirname $0) && pwd -P)/$(basename $0):/usr/local/bin/run.sh:ro" export AOSP_EXTRA_ARGS="-v $(cd $(dirname $0) && pwd -P)/$(basename $0):/usr/local/bin/run.sh:ro"
export AOSP_IMAGE="kylemanna/aosp:4.4-kitkat" export AOSP_IMAGE="kylemanna/aosp:4.4-kitkat"