Skip to content

Commit

Permalink
Make ARM bazel bin internal (ApolloAuto#1829)
Browse files Browse the repository at this point in the history
  • Loading branch information
siyangy authored and wanglei828 committed Sep 19, 2017
1 parent ac92911 commit 797c855
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
6 changes: 1 addition & 5 deletions WORKSPACE.in
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,7 @@ new_http_archive(
name = "ros",
build_file = "third_party/ros.BUILD",
strip_prefix = "ros",
# url = "https://github.com/ApolloAuto/apollo-platform/releases/download/1.0.0/ros-indigo-apollo-1.0.0.MACHINE_ARCH.tar.gz",
# temporary ros archive for apollo-1.5
# url = "https://github.com/fengqikai1414/apollo-platform/releases/download/1.5.0/ros_test_pcl.tar.gz",
# (TODO) support ARM
url = "https://github.com/ApolloAuto/apollo-platform/releases/download/1.5.0/ros-indigo-apollo-1.5.0-x84_64.tar.gz",
url = "https://github.com/ApolloAuto/apollo-platform/releases/download/1.5.0/ros-indigo-apollo-1.5.0-MACHINE_ARCH.tar.gz",
)

# OpenCV 2.4.13.2
Expand Down
6 changes: 0 additions & 6 deletions docker/dev.aarch64.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ RUN apt-get install -y oracle-java8-installer
RUN apt-get clean autoclean && apt-get autoremove -y
RUN rm -fr /var/lib/apt/lists/*

## Copy bazel to /usr/local/bin
RUN mkdir -p /usr/local/bin
WORKDIR /usr/local/bin/
RUN wget https://github.com/startcode/bazel-arm64/releases/download/0.4.4/bazel-aarch64 && ln -rs bazel-aarch64 bazel
RUN chmod +x /usr/local/bin/bazel-aarch64

# Install protobuf 3.3.0
WORKDIR /tmp
RUN wget https://github.com/google/protobuf/releases/download/v3.3.0/protobuf-cpp-3.3.0.tar.gz
Expand Down

0 comments on commit 797c855

Please sign in to comment.