Use lzhiyong tooling

Author: Taknok

.github/workflows/build.yml

@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
     inputs:
       logLevel:
-        description: 'Reason'     
+        description: 'Reason'
         required: false
         default: 'Update package'
 
@@ -24,22 +24,39 @@ jobs:
         target_arch: [x86_64, x86, arm64-v8a, armeabi-v7a]
       fail-fast: false
     steps:
-      - name: Checkout
+      - name: Checkout repo
         uses: actions/checkout@v4
         with:
           submodules: 'true'
 
-      - uses: nttld/setup-ndk@v1
+      - name: Setting up NDK
+        uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
           ndk-version: r23c
           add-to-path: false
-      - run: ./build.sh ${{ matrix.target_arch }}
+
+      - name: Getting AOSP's source code
+        run: |
+          python3 ./get_source.py --tags platform-tools-35.0.2
+
+      - name: Compiling protoc
+        run: |
+          mkdir -p src/protobuf/build
+          pushd src/protobuf/build
+          cmake -GNinja -Dprotobuf_BUILD_TESTS=OFF ..
+          ninja -j$(nproc --all)
+          popd
+        env:
+          NDK_TOOLCHAIN: ${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64
+
+      - name: Compiling aapt2
+        run: python3 ./build.py --ndk=${{ steps.setup-ndk.outputs.ndk-path }} --abi=${{ matrix.target_arch }} --build="build/${{ matrix.target_arch }}" --protoc=/${{ github.workspace }}/src/protobuf/build/protoc --target aapt2
         env:
           NDK_TOOLCHAIN: ${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: dist-${{ matrix.target_arch }}
-          path: dist
+          name: aapt2-${{ matrix.target_arch }}
+          path: ${{ github.workspace }}/build/${{ matrix.target_arch }}/bin/aapt2

.gitignore

@@ -1,2 +1,14 @@
-bin/
-build/
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+build
+pack
+src
+# remove git history
+git_remove_history.sh

.gitmodules

@@ -1,46 +1,81 @@
+#
+# Copyright © 2022 Github Lzhiyong
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 cmake_minimum_required(VERSION 3.14.2)
 project(sdk-tools)
 
-if(ANDROID_ABI STREQUAL "arm64-v8a" OR ANDROID_ABI STREQUAL "armeabi-v7a")
-    enable_language(ASM)
-elseif(ANDROID_ABI STREQUAL "x86_64" OR ANDROID_ABI STREQUAL "x86")
-    enable_language(ASM_NASM)
-else()
-    message(FATAL_ERROR "Unsupported architecture: ${ANDROID_ABI}")
-endif()
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_CXX_STANDARD 20)
+enable_language(ASM)
 
 # set global cflags and cxxflags
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcolor-diagnostics -fPIC -Wno-attributes -std=gnu11")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics -fPIC -Wno-attributes -std=gnu++2a")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcolor-diagnostics -fPIC -Wno-attributes")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics -fPIC -Wno-attributes")
 # static link
 set(CMAKE_EXE_LINKER_FLAGS "-static")
 
 # platform tools version
 # see the patches/other/platform_tools_version.h
-set(TOOLS_VERSION 33.0.1)
+set(TOOLS_VERSION 35.0.1)
 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)
+
+if(DEFINED PROTOC_PATH)
+    set(PROTOC_COMPILER ${PROTOC_PATH})
 
-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")
+    if(NOT EXISTS ${PROTOC_COMPILER})
+        unset(PROTOC_PATH CACHE)
+        message(FATAL_ERROR "Invalid protoc: ${PROTOC_COMPILER}, please check if the path is correct")
+    endif()
+
+    # check protoc version
+    execute_process(
+        COMMAND ${PROTOC_COMPILER} --version
+        OUTPUT_VARIABLE PTOTOBUF_VERSION
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    )
+
+    if(NOT PTOTOBUF_VERSION MATCHES "^libprotoc*")
+        unset(PROTOC_PATH CACHE)
+        message(FATAL_ERROR "Invalid protoc: ${PROTOC_COMPILER}, this may not be an executable")
+    endif()
+
+    string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" VERSIONS ${PTOTOBUF_VERSION})
+    # please note that if the protobuf version is too high, you may encounter the following error
+    # error: This file was generated by a newer version of protoc 
+    if(VERSIONS VERSION_GREATER "3.21.12")
+        message(WARNING "${PTOTOBUF_VERSION}, the protobuf version is too high, may be incompatible!!")
+    endif()
 endif()
 
 # thrid-party libraries
 add_subdirectory(src/boringssl EXCLUDE_FROM_ALL)
 add_subdirectory(src/fmtlib EXCLUDE_FROM_ALL)
 add_subdirectory(src/pcre EXCLUDE_FROM_ALL)
-add_subdirectory(src/expat EXCLUDE_FROM_ALL)
-add_subdirectory(src/zopfli EXCLUDE_FROM_ALL)
-add_subdirectory(src/protobuf/cmake EXCLUDE_FROM_ALL)
+add_subdirectory(src/libpng EXCLUDE_FROM_ALL)
+add_subdirectory(src/jsoncpp EXCLUDE_FROM_ALL)
+add_subdirectory(src/expat/expat EXCLUDE_FROM_ALL)
+add_subdirectory(src/protobuf EXCLUDE_FROM_ALL)
+add_subdirectory(src/googletest EXCLUDE_FROM_ALL)
 
 # building sdk-tools
-add_subdirectory(cmake)
+add_subdirectory(lib)
+add_subdirectory(build-tools)
+