Remove incorrect use of std::vector.reserve

[platform/upstream/armnn.git] / BuildGuideAndroidNDK.md

diff --git a/BuildGuideAndroidNDK.md b/BuildGuideAndroidNDK.md
index 7084456..6b5d8d7 100644 (file)
--- a/BuildGuideAndroidNDK.md
+++ b/BuildGuideAndroidNDK.md
@@ -54,7 +54,7 @@ All downloaded or generated files will be saved inside the `~/armnn-devenv` dire
        cd ~/armnn-devenv/boost/boost_1_64_0
        ./bootstrap.sh --prefix=$HOME/armnn-devenv/boost/install
        ./b2 install --user-config=$HOME/armnn-devenv/boost/user-config.jam \
-     toolset=clang-arm link=static cxxflags=-fPIC --with-filesystem \
+     toolset=clang-arm link=static cxxflags=-fPIC \
         --with-test --with-log --with-program_options -j16
     ```
  Note: You can specify the 'Android_API' version you want. For example, if your ANDROID_API is 27 then the compiler will be aarch64-linux-android27-clang++.
@@ -97,7 +97,7 @@ All downloaded or generated files will be saved inside the `~/armnn-devenv` dire
        cd ~/armnn-devenv/google
        git clone https://github.com/google/protobuf.git
        cd protobuf
-       git checkout -b v3.5.2 v3.5.2
+       git checkout -b v3.12.0 v3.12.0
        ```
 
 * Build a native (x86) version of the protobuf libraries and compiler (protoc):
@@ -137,11 +137,9 @@ All downloaded or generated files will be saved inside the `~/armnn-devenv` dire
        cd ~/armnn-devenv/google/
        git clone https://github.com/tensorflow/tensorflow.git
         cd tensorflow/
-        git checkout 590d6eef7e91a6a7392c8ffffb7b58f2e0c8bc6b
+        git checkout fcc4b966f1265f466e82617020af93670141b009
        ```
 
-       You need tensorflow/contrib/makefile/tf_proto_files.txt from TensorFlow to generate TensorFlow protobuf definitions. This file is not available in TensorFlow master branch.
-
 #### <a name="buildArmNN">Build ArmNN</a>
 
 * Clone ArmNN source code:
@@ -230,7 +228,6 @@ All downloaded or generated files will be saved inside the `~/armnn-devenv` dire
     -DCMAKE_MODULE_LINKER_FLAGS="-llog" \
     -DBOOST_ROOT=$HOME/armnn-devenv/boost/install \
     -DBoost_SYSTEM_LIBRARY=$HOME/armnn-devenv/boost/install/lib/libboost_system.a \
-    -DBoost_FILESYSTEM_LIBRARY=$HOME/armnn-devenv/boost/install/lib/libboost_filesystem.a \
     -DARMNN_PATH=$HOME/armnn-devenv/armnn/build/libarmnn.so ..
     ```
 
@@ -251,9 +248,9 @@ All downloaded or generated files will be saved inside the `~/armnn-devenv` dire
         adb push libtimelineDecoder.so /data/local/tmp/
        adb push UnitTests /data/local/tmp/
        adb push $NDK/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_shared.so /data/local/tmp/
-       adb push $HOME/armnn-devenv/google/arm64_pb_install/lib/libprotobuf.so /data/local/tmp/libprotobuf.so.15.0.1
-       adb shell 'ln -s libprotobuf.so.15.0.1 /data/local/tmp/libprotobuf.so.15'
-       adb shell 'ln -s libprotobuf.so.15.0.1 /data/local/tmp/libprotobuf.so'
+       adb push $HOME/armnn-devenv/google/arm64_pb_install/lib/libprotobuf.so /data/local/tmp/libprotobuf.so.23.0.0
+       adb shell 'ln -s libprotobuf.so.23.0.0 /data/local/tmp/libprotobuf.so.23'
+       adb shell 'ln -s libprotobuf.so.23.0.0 /data/local/tmp/libprotobuf.so'
        ```
 
 * Push the files needed for the unit tests (they are a mix of files, directories and symbolic links):