Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 194f520f authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge branch 'pie-x86' into 'master' 

Update Docker for Android Pie x86 target

See merge request !35
parents ddb2f64d 6e148d57

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ RUN apt-get install -y bc bison bsdmainutils build-essential ccache cgpt clang c 
      lib32ncurses5-dev libncurses5 lib32readline-dev lib32z1-dev libtinfo5 liblz4-tool \

      libncurses5-dev libsdl1.2-dev libssl-dev libxml2 \

      libxml2-utils lsof lzop maven pngcrush \

      procps python python3 rsync schedtool squashfs-tools software-properties-common wget xdelta3 xsltproc yasm \

      procps python python3 rsync schedtool squashfs-tools software-properties-common wget xdelta3 xsltproc xxd yasm \

      zip zlib1g-dev



RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo

src/build.sh

+2 −2
Original line number Diff line number Diff line
@@ -211,8 +211,8 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then 
      if make systemimage; then

        build_success=true

      fi

    elif [ "${USE_LUNCH}" = true ]; then

      if lunch "${BRUNCH_DEVICE}" && mka && mka sdk_addon ; then

    elif [ "${IS_EMULATOR}" = true ]; then

      if lunch "${BRUNCH_DEVICE}" && mka sdk_addon ; then

        build_success=true

      fi

    elif brunch "${BRUNCH_DEVICE}"; then