[compile cherry-pick] add java lib and benchmark_bin into default publish result (#2958)

docs/installation/source_compile.md

@@ -260,7 +260,7 @@ git checkout <release-version-tag>
 | --arm_abi  |必选，选择编译的arm版本，其中`armv7hf`为ARMLinux编译时选用| `armv8`、`armv7`、`armv7hf`(仅`armlinux`支持) |
 | --arm_lang |arm_os=android时必选，选择编译器 | `gcc`、`clang`(`clang`当前暂不支持) |
 | --android_stl |arm_os=android时必选，选择静态链接STL或动态链接STL | `c++_static`、`c++_shared`|
-| --build_java | 可选，是否编译java预测库（默认为OFF） | `ON`、`OFF` |
+| --build_java | 可选，是否编译java预测库（默认为ON） | `ON`、`OFF` |
 | --build_extra | 可选，是否编译全量预测库（默认为OFF）。详情可参考[预测库说明](./library.html)。 | `ON`、`OFF` |
 | target |必选，选择编译模式，`tiny_publish`为编译移动端部署库、`full_publish`为带依赖的移动端部署库、`test`为移动端单元测试、`ios`为编译ios端`tiny_publish` | `tiny_publish`、`full_publish`、`test`、 `ios` |
 
@@ -277,9 +277,7 @@ git checkout <release-version-tag>
   --arm_abi=armv8 \
   --build_extra=OFF \
   --arm_lang=gcc \
-  --build_java=ON \
   --android_stl=c++_static \
-  --build_extra=OFF \
   tiny_publish
 ```
 ##### IOS
@@ -304,11 +302,9 @@ sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
 ```shell
 ./lite/tools/build.sh \
   --build_extra=OFF \
-  --build_java=ON \
   --arm_os=armlinux \
   --arm_abi=armv7hf \
   --arm_lang=gcc \
-  --build_extra=OFF \
   tiny_publish
 ```
 - `--arm_abi`: 树莓派3b使用armv7hf，RK3399使用armv8
@@ -322,9 +318,7 @@ sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
   --arm_abi=armv8 \
   --build_extra=OFF \
   --arm_lang=gcc \
-  --build_java=ON \
   --android_stl=c++_static \
-  --build_extra=OFF \
   full_publish
 ```
 ##### ARMLinux
@@ -333,7 +327,6 @@ sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
   --arm_os=armlinux \
   --arm_abi=armv7hf \
   --arm_lang=gcc \
-  --build_java=ON \
   --build_extra=OFF \
   full_publish
 ```

lite/CMakeLists.txt

@@ -135,22 +135,23 @@ if (LITE_WITH_LIGHT_WEIGHT_FRAMEWORK AND LITE_WITH_ARM)
                 COMMAND cp "${CMAKE_SOURCE_DIR}/lite/api/paddle_*.h" "${INFER_LITE_PUBLISH_ROOT}/cxx/include"
                 COMMAND cp "${CMAKE_BINARY_DIR}/libpaddle_api_full_bundled.a" "${INFER_LITE_PUBLISH_ROOT}/cxx/lib"
                 COMMAND cp "${CMAKE_BINARY_DIR}/libpaddle_api_light_bundled.a" "${INFER_LITE_PUBLISH_ROOT}/cxx/lib"
-                #COMMAND cp "${CMAKE_BINARY_DIR}/lite/api/model_optimize_tool" "${INFER_LITE_PUBLISH_ROOT}/bin"
                 COMMAND cp "${CMAKE_BINARY_DIR}/lite/gen_code/paddle_code_generator" "${INFER_LITE_PUBLISH_ROOT}/bin"
                 COMMAND cp "${CMAKE_BINARY_DIR}/lite/api/test_model_bin" "${INFER_LITE_PUBLISH_ROOT}/bin"
                 COMMAND cp "${CMAKE_SOURCE_DIR}/lite/utils/cv/paddle_*.h" "${INFER_LITE_PUBLISH_ROOT}/cxx/include"
                 )
             if(NOT IOS)
-                #add_dependencies(publish_inference_cxx_lib model_optimize_tool)
                 add_dependencies(publish_inference_cxx_lib paddle_code_generator)
                 add_dependencies(publish_inference_cxx_lib bundle_full_api)
                 add_dependencies(publish_inference_cxx_lib bundle_light_api)
                 add_dependencies(publish_inference_cxx_lib test_model_bin)
+                add_dependencies(publish_inference_cxx_lib benchmark_bin)
                 if (ARM_TARGET_OS STREQUAL "android" OR ARM_TARGET_OS STREQUAL "armlinux")
                     add_dependencies(publish_inference_cxx_lib paddle_full_api_shared)
                     add_dependencies(publish_inference paddle_light_api_shared)
                     add_custom_command(TARGET publish_inference_cxx_lib
-                          COMMAND cp ${CMAKE_BINARY_DIR}/lite/api/*.so ${INFER_LITE_PUBLISH_ROOT}/cxx/lib)
+                          COMMAND cp ${CMAKE_BINARY_DIR}/lite/api/*.so ${INFER_LITE_PUBLISH_ROOT}/cxx/lib
+                          COMMAND cp "${CMAKE_BINARY_DIR}/lite/api/benchmark_bin" "${INFER_LITE_PUBLISH_ROOT}/bin"
+                          )
                 endif()
                 add_dependencies(publish_inference publish_inference_cxx_lib)
                 if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")

lite/tools/build.sh

@@ -14,7 +14,7 @@ readonly NUM_PROC=${LITE_BUILD_THREADS:-4}
 
 # global variables
 BUILD_EXTRA=OFF
-BUILD_JAVA=OFF
+BUILD_JAVA=ON
 BUILD_PYTHON=OFF
 BUILD_DIR=$(pwd)
 OPTMODEL_DIR=""