Use prebuilt protoc

Author: Taknok

.github/workflows/build_pull_request.yml

@@ -27,21 +27,17 @@ jobs:
           ndk-version: r27c
           add-to-path: false
 
+      - name: Get protoc
+        run: |
+          wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-x86_64.zip
+          sudo unzip -p protoc-*.zip bin/protoc -d /usr/local/bin/
+
       - name: Patch
         run: bash ./patch.sh
 
-      - name: Compile protoc
-        run: |
-          mkdir -p src/protobuf/build
-          pushd src/protobuf/build
-          cmake -GNinja -Dprotobuf_BUILD_TESTS=OFF ..
-          ninja -j$(nproc --all)
-          popd
-
       - name: Compile aapt2
         env:
           ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
-          PROTOC_PATH: "/${{ github.workspace }}/src/protobuf/build/protoc"
         run: bash ./build.sh ${{ matrix.target_arch }}
 
       - name: Upload artifacts

.github/workflows/release.yml

@@ -28,21 +28,17 @@ jobs:
           ndk-version: r27c
           add-to-path: false
 
+      - name: Get protoc
+        run: |
+          wget https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-linux-x86_64.zip
+          sudo unzip -p protoc-*.zip bin/protoc -d /usr/local/bin/
+
       - name: Patch
         run: bash ./patch.sh
 
-      - name: Compile protoc
-        run: |
-          mkdir -p src/protobuf/build
-          pushd src/protobuf/build
-          cmake -GNinja -Dprotobuf_BUILD_TESTS=OFF ..
-          ninja -j$(nproc --all)
-          popd
-
       - name: Compile aapt2
         env:
           ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
-          PROTOC_PATH: "${{ github.workspace }}/src/protobuf/build/protoc"
         run: bash ./build.sh ${{ matrix.target_arch }}
 
       - name: Upload artifacts
@@ -51,7 +47,7 @@ jobs:
           name: aapt2-${{ matrix.target_arch }}
           path: ${{ github.workspace }}/build/bin/aapt2-*
           if-no-files-found: error
-          
+
   release:
     needs: build
     runs-on: ubuntu-latest

CMakeLists.txt

@@ -26,16 +26,11 @@ set(SRC ${PROJECT_SOURCE_DIR}/src)
 # 64-bit off_t for lseek.
 add_definitions(-D_FILE_OFFSET_BITS=64)
 
-if(NOT DEFINED PROTOC_PATH)
-    message(FATAL_ERROR "PROTOC_PATH undefined, please make sure to build and install protoc from the cloned submodule." )
-endif()
-
-set(PROTOC_COMPILER ${PROTOC_PATH})
-    
-if(NOT EXISTS ${PROTOC_COMPILER})
-    unset(PROTOC_PATH CACHE)
-    message(FATAL_ERROR "Invalid protoc: ${PROTOC_COMPILER}, please check if the path is correct")
-endif()
+# protoc options
+set(protobuf_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+set(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "" FORCE)
+set(protobuf_BUILD_LIBPROTOC ON CACHE BOOL "" FORCE)
 
 # thrid-party libraries
 add_subdirectory(src/boringssl EXCLUDE_FROM_ALL)

README.md

@@ -4,6 +4,9 @@
 
 This repository contains a workflow to build the aapt2 binaries for Android.
 
+Currently, the submodules are pinned to platform-tools 35.0.2 of AOSP source code. `src/base` example:
+https://android.googlesource.com/platform/frameworks/base/+/refs/tags/platform-tools-35.0.2
+
 # Build
 
 ## Fetch submodules

build-tools/aapt2.cmake

@@ -5,24 +5,29 @@ set(AAPT2_PROTO_DIR ${SRC}/base/tools/aapt2)
 
 file(GLOB_RECURSE PROTO_FILES ${AAPT2_PROTO_DIR}/*.proto)
 
+find_package(Protobuf)
+
+if(NOT EXISTS ${Protobuf_PROTOC_EXECUTABLE})
+    message(FATAL_ERROR "Invalid protoc: ${Protobuf_PROTOC_EXECUTABLE}")
+endif()
+
+
 foreach(proto ${PROTO_FILES})
     get_filename_component(FIL_WE ${proto} NAME_WE)
 
-    if(DEFINED PROTOC_PATH)
-        # Execute the protoc command to generate the proto targets for host arch.
-        execute_process(
-            COMMAND ${PROTOC_COMPILER} ${proto}
-            --proto_path=${AAPT2_PROTO_DIR}
-            --cpp_out=${AAPT2_PROTO_DIR}
-            COMMAND_ECHO STDOUT
-            RESULT_VARIABLE RESULT
-            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-        )
-
-        if(RESULT EQUAL 0)
-            message(STATUS "generate cpp file ${TARGET_CPP_FILE}")
-            message(STATUS "generate head file ${TARGET_HEAD_FILE}")
-        endif()
+    # Execute the protoc command to generate the proto targets for host arch.
+    execute_process(
+        COMMAND ${Protobuf_PROTOC_EXECUTABLE} ${proto}
+        --proto_path=${AAPT2_PROTO_DIR}
+        --cpp_out=${AAPT2_PROTO_DIR}
+        COMMAND_ECHO STDOUT
+        RESULT_VARIABLE RESULT
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    )
+
+    if(RESULT EQUAL 0)
+        message(STATUS "generate cpp file ${TARGET_CPP_FILE}")
+        message(STATUS "generate head file ${TARGET_HEAD_FILE}")
     endif()
 
     set(TARGET_CPP_FILE "${AAPT2_PROTO_DIR}/${FIL_WE}.pb.cc")
@@ -34,10 +39,9 @@ foreach(proto ${PROTO_FILES})
     endif()
 endforeach()
 
-if(DEFINED PROTOC_PATH)
-    set_source_files_properties(${AAPT2_PROTO_SRC} PROPERTIES GENERATED TRUE)
-    set_source_files_properties(${AAPT2_PROTO_HDRS} PROPERTIES GENERATED TRUE)
-endif()
+set_source_files_properties(${AAPT2_PROTO_SRC} PROPERTIES GENERATED TRUE)
+set_source_files_properties(${AAPT2_PROTO_HDRS} PROPERTIES GENERATED TRUE)
+
 set_source_files_properties(${AAPT2_PROTO_SRC} ${AAPT2_PROTO_HDRS}
                             PROPERTIES GENERATED TRUE)
 # ========================= aapt2 proto ============================

build.sh

@@ -25,13 +25,6 @@ if [[ -z "${ANDROID_NDK}" ]]; then
     exit 1
 fi
 
-# Check if PROTOC_PATH is missing or if the file doesn't exist
-if [[ -z "$PROTOC_PATH" || ! -f "$PROTOC_PATH" ]]; then
-    echo "Error: PROTOC_PATH is missing in env or file does not exist."
-    help
-    exit 1
-fi
-
 architecture="$1"
 
 if [[ ! " ${ARCHITECTURES[@]} " =~ " $architecture " ]]; then
@@ -50,15 +43,9 @@ cmake -GNinja \
   -DANDROID_PLATFORM="android-$API" \
   -DCMAKE_ANDROID_ARCH_ABI="$architecture" \
   -DANDROID_ABI="$architecture" \
-  -DPROTOC_PATH="$PROTOC_PATH" \
   -DCMAKE_SYSTEM_NAME=Android \
   -DANDROID_ARM_NEON=ON \
   -DCMAKE_BUILD_TYPE=Release \
-  -Dprotobuf_BUILD_TESTS=OFF \
-  -DABSL_PROPAGATE_CXX_STD=ON \
-  -Dprotobuf_BUILD_SHARED_LIBS=OFF \
-  -Dprotobuf_BUILD_PROTOC_BINARIES=OFF \
-  -Dprotobuf_BUILD_LIBPROTOC=ON \
   -DPNG_SHARED=OFF \
   -DZLIB_USE_STATIC_LIBS=ON