Merge pull request #1 from hzzheyang/main

dev

.github/workflows/build.yml

@@ -1,14 +1,14 @@
 name: strongR-frida
 
-on: 
+on:
   schedule:
     - cron: "0 9/12 * * *"
   workflow_dispatch:
-  
-jobs:
+
+jobs: 
   check_version:
     runs-on: ubuntu-20.04
-    
+
     outputs:
       FRIDA_VERSION: ${{ steps.pullFridaLatestRelease.outputs.FRIDA_VERSION }}
       ALREADY_RELEASE: ${{ steps.checkReleaseVersion.outputs.ALREADY_RELEASE }}
@@ -57,8 +57,8 @@ jobs:
                 core.setFailed(e.message);
               }
             }
-     
-     
+
+
   create_release:
     needs: check_version
     runs-on: ubuntu-20.04
@@ -85,21 +85,21 @@ jobs:
     - uses: actions/setup-node@v2.1.4
       with:
         node-version: '10'
-    
+
     - uses: fusion-engineering/setup-git-credentials@v2
       with:
         credentials: ${{secrets.GIT_CREDENTIALS}}
-    
+
     - name: set up JDK 1.8
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
 
     - name: Setup Android NDK
       id: setup-ndk
-      uses: nttld/setup-ndk@v1.0.3
+      uses: nttld/setup-ndk@v1.0.6
       with:
-        ndk-version: r22
+        ndk-version: r24-beta1
 
     - name: Set up Python 3.8
       uses: actions/setup-python@v2
@@ -111,7 +111,7 @@ jobs:
         sudo apt-get update && DEBIAN_FRONTEND=noninteractive sudo apt-get install build-essential tree ninja-build gcc-multilib g++-multilib lib32stdc++-9-dev flex bison xz-utils ruby ruby-dev python3-requests python3-setuptools python3-dev python3-pip libc6-dev libc6-dev-i386 -y
         sudo gem install fpm -v 1.11.0 --no-document
         python3 -m pip install lief
-      
+
     - name: build frida for Android
       shell: bash
       run: |
@@ -127,7 +127,8 @@ jobs:
         make core-android-arm64
         make core-android-x86
         make core-android-x86_64
-        
+
+
     - name: Check release version
       id: checkReleaseVersion
       uses: actions/github-script@v3.1.0
@@ -151,43 +152,128 @@ jobs:
           } catch (e) {
             core.setFailed(e.message);
           }
-          
+    - name: package build result for Android
+      shell: bash
+      run: |
+        pushd frida
+        
+        xz build/frida-android-arm/bin/frida-server
+        xz build/frida-android-arm64/bin/frida-server
+        
+        xz build/frida-android-x86/bin/frida-server
+        xz build/frida-android-x86_64/bin/frida-server
+        
+        xz build/frida-android-arm/bin/frida-inject
+        xz build/frida-android-arm64/bin/frida-inject
+        
+        xz build/frida-android-x86/bin/frida-inject
+        xz build/frida-android-x86_64/bin/frida-inject
+        
+        xz build/frida-android-arm/lib/frida/32/frida-gadget.so
+        xz build/frida-android-arm64/lib/frida/64/frida-gadget.so
+        
+        xz build/frida-android-x86/lib/frida/32/frida-gadget.so
+        xz build/frida-android-x86_64/lib/frida/64/frida-gadget.so
+        
+        popd
+        
     - name: Upload android arm frida-server for strongR-frida
       uses: actions/upload-release-asset@v1.0.2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: '${{ steps.checkReleaseVersion.outputs.upload_url }}'
-        asset_path: '${{ github.workspace }}/frida/build/frida-android-arm/bin/frida-server'
-        asset_name: 'hluda-server-${{ needs.check_version.outputs.FRIDA_VERSION }}-android-arm'
+        asset_path: '${{ github.workspace }}/frida/build/frida-android-arm/bin/frida-server.xz'
+        asset_name: 'hluda-server-${{ needs.check_version.outputs.FRIDA_VERSION }}-android-arm.xz'
         asset_content_type: application/octet-stream
-  
+
     - name: Upload android arm64 frida-server for strongR-frida
       uses: actions/upload-release-asset@v1.0.2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: '${{ steps.checkReleaseVersion.outputs.upload_url }}'
-        asset_path: '${{ github.workspace }}/frida/build/frida-android-arm64/bin/frida-server'
-        asset_name: 'hluda-server-${{ needs.check_version.outputs.FRIDA_VERSION }}-android-arm64'
+        asset_path: '${{ github.workspace }}/frida/build/frida-android-arm64/bin/frida-server.xz'
+        asset_name: 'hluda-server-${{ needs.check_version.outputs.FRIDA_VERSION }}-android-arm64.xz'
         asset_content_type: application/octet-stream
-    
+
     - name: Upload android x86 frida-server for strongR-frida
       uses: actions/upload-release-asset@v1.0.2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: '${{ steps.checkReleaseVersion.outputs.upload_url }}'
-        asset_path: '${{ github.workspace }}/frida/build/frida-android-x86/bin/frida-server'
-        asset_name: 'hluda-server-${{ needs.check_version.outputs.FRIDA_VERSION }}-android-x86'
+        asset_path: '${{ github.workspace }}/frida/build/frida-android-x86/bin/frida-server.xz'
+        asset_name: 'hluda-server-${{ needs.check_version.outputs.FRIDA_VERSION }}-android-x86.xz'
         asset_content_type: application/octet-stream
-        
+
     - name: Upload android x86_64 frida-server for strongR-frida
       uses: actions/upload-release-asset@v1.0.2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: '${{ steps.checkReleaseVersion.outputs.upload_url }}'
-        asset_path: '${{ github.workspace }}/frida/build/frida-android-x86_64/bin/frida-server'
-        asset_name: 'hluda-server-${{ needs.check_version.outputs.FRIDA_VERSION }}-android-x86_64'
+        asset_path: '${{ github.workspace }}/frida/build/frida-android-x86_64/bin/frida-server.xz'
+        asset_name: 'hluda-server-${{ needs.check_version.outputs.FRIDA_VERSION }}-android-x86_64.xz'
+        asset_content_type: application/octet-stream
+
+    - name: Upload android arm frida-inject for strongR-frida
+      uses: actions/upload-release-asset@v1.0.2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: '${{ steps.checkReleaseVersion.outputs.upload_url }}'
+        asset_path: '${{ github.workspace }}/frida/build/frida-android-arm/bin/frida-inject.xz'
+        asset_name: 'hluda-inject-${{ needs.check_version.outputs.FRIDA_VERSION }}-android-arm.xz'
+        asset_content_type: application/octet-stream
+
+    - name: Upload android arm64 frida-inject for strongR-frida
+      uses: actions/upload-release-asset@v1.0.2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: '${{ steps.checkReleaseVersion.outputs.upload_url }}'
+        asset_path: '${{ github.workspace }}/frida/build/frida-android-arm64/bin/frida-inject.xz'
+        asset_name: 'hluda-inject-${{ needs.check_version.outputs.FRIDA_VERSION }}-android-arm64.xz'
+        asset_content_type: application/octet-stream
+
+    - name: Upload android x86 frida-inject for strongR-frida
+      uses: actions/upload-release-asset@v1.0.2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: '${{ steps.checkReleaseVersion.outputs.upload_url }}'
+        asset_path: '${{ github.workspace }}/frida/build/frida-android-x86/bin/frida-inject.xz'
+        asset_name: 'hluda-inject-${{ needs.check_version.outputs.FRIDA_VERSION }}-android-x86.xz'
+        asset_content_type: application/octet-stream
+
+    - name: Upload android x86_64 frida-inject for strongR-frida
+      uses: actions/upload-release-asset@v1.0.2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: '${{ steps.checkReleaseVersion.outputs.upload_url }}'
+        asset_path: '${{ github.workspace }}/frida/build/frida-android-x86_64/bin/frida-inject.xz'
+        asset_name: 'hluda-inject-${{ needs.check_version.outputs.FRIDA_VERSION }}-android-arm-x86_64.xz'
+        asset_content_type: application/octet-stream
+
+    - name: Upload android arm frida-gadget for strongR-frida
+      uses: actions/upload-release-asset@v1.0.2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: '${{ steps.checkReleaseVersion.outputs.upload_url }}'
+        asset_path: '${{ github.workspace }}/frida/build/frida-android-arm/lib/frida/32/frida-gadget.so.xz'
+        asset_name: 'hluda-gadget-${{ needs.check_version.outputs.FRIDA_VERSION }}-android-arm.so.xz'
+        asset_content_type: application/octet-stream
+
+    - name: Upload android arm64 frida-gadget for strongR-frida
+      uses: actions/upload-release-asset@v1.0.2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: '${{ steps.checkReleaseVersion.outputs.upload_url }}'
+        asset_path: '${{ github.workspace }}/frida/build/frida-android-arm64/lib/frida/64/frida-gadget.so.xz'
+        asset_name: 'hluda-gadget-${{ needs.check_version.outputs.FRIDA_VERSION }}-android-arm64.so.xz'
         asset_content_type: application/octet-stream
+

README.md

@@ -23,7 +23,7 @@ Follow [FRIDA](https://github.com/frida/frida) upstream to automatic patch and b
 
 ## Download
 
-[Latest Release](https://github.com/hluwa/strongR-frida-android/releases/latest)
+[Latest Release](https://github.com/hzzheyang/strongR-frida-android/releases/latest)
 
 ## References