Skip to content

Commit 82da22f

Browse files
committed
android: move to build dir
1 parent 6a791d7 commit 82da22f

35 files changed

Lines changed: 6 additions & 6 deletions

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,12 @@ jobs:
227227
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
228228
- name: build
229229
run: |
230-
cd android
230+
cd build/android
231231
./gradlew copy_aar --warning-mode all
232232
myci-apply-version.sh --version $PACKAGE_VERSION *.pom.in
233233
myci-apply-version.sh --version $PACKAGE_VERSION *.aar.in --filename-only
234234
- name: deploy
235-
run: myci-deploy-maven-nexus.sh --base-url https://gagis.hopto.org/nexus --repo android android/$PACKAGE_NAME-$PACKAGE_VERSION.aar
235+
run: myci-deploy-maven-nexus.sh --base-url https://gagis.hopto.org/nexus --repo android build/android/$PACKAGE_NAME-$PACKAGE_VERSION.aar
236236
if: startsWith(github.ref, 'refs/tags/')
237237
##### msys2 #####
238238
msys2:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cmake_minimum_required(VERSION 3.4.1)
1010
# and CMake builds them for you. When you build your app, Gradle
1111
# automatically packages shared libraries with your APK.
1212

13-
file(GLOB_RECURSE srcs "../../tests/app/*.cpp")
13+
file(GLOB_RECURSE srcs "../../../tests/app/*.cpp")
1414

1515
set(name ruisapp_application) # this has to be 'ruisapp_application' so that RuisappActivity loads that named .so
1616

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ dependencies {
5757
task copyResToAssets {
5858
doLast {
5959
copy{
60-
from "../../tests/app/res"
60+
from "../../../tests/app/res"
6161
into "src/main/assets/res"
6262
include "**/*"
6363
}
File renamed without changes.

android/app/src/main/res/mipmap-hdpi/ic_launcher.png renamed to build/android/app/src/main/res/mipmap-hdpi/ic_launcher.png

File renamed without changes.

android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png renamed to build/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png

File renamed without changes.

android/app/src/main/res/mipmap-mdpi/ic_launcher.png renamed to build/android/app/src/main/res/mipmap-mdpi/ic_launcher.png

File renamed without changes.

0 commit comments

Comments
 (0)