mirrors/libsignal
1
0
Fork 0
mirror of https://github.com/signalapp/libsignal.git synced 2025-12-05 01:10:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move makefile and docker file into java subdir

Browse Source
This commit is contained in:
Jack Lloyd
2020-11-06 15:54:59 -05:00
parent 3c8d85211b
commit dd57254f8f
7 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.dockerignore Normal file
View File

@@ -0,0 +1,5 @@
/target
/java/build
/java/android/build
/java/java/build
/java/tests/build

2
Dockerfile → java/Dockerfile
View File

@@ -69,7 +69,7 @@ RUN rustup target add armv7-linux-androideabi aarch64-linux-android i686-linu
# Pre-download Gradle. # Pre-download Gradle.
COPY java/gradle gradle COPY java/gradle gradle
COPY java/gradlew . COPY java/gradlew gradlew
RUN ./gradlew --version RUN ./gradlew --version
RUN echo "${RUST_TOOLCHAIN}" > rust-toolchain RUN echo "${RUST_TOOLCHAIN}" > rust-toolchain

8
Makefile → java/Makefile
View File

@@ -12,17 +12,17 @@ default: java_build
DOCKER_IMAGE := libsignal-builder DOCKER_IMAGE := libsignal-builder
docker_image: docker_image:
$(DOCKER) build --build-arg UID=$$(id -u) --build-arg GID=$$(id -g) -t $(DOCKER_IMAGE) . cd .. && $(DOCKER) build --build-arg UID=$$(id -u) --build-arg GID=$$(id -g) -t $(DOCKER_IMAGE) -f java/Dockerfile .
java_build: DOCKER_EXTRA=$(shell [ -L build ] && P=$$(readlink build) && echo -v $$P/:$$P ) java_build: DOCKER_EXTRA=$(shell [ -L build ] && P=$$(readlink build) && echo -v $$P/:$$P )
java_build: docker_image java_build: docker_image
$(DOCKER) run --rm --user $$(id -u):$$(id -g) \ $(DOCKER) run --rm --user $$(id -u):$$(id -g) \
-v `pwd`/:/home/libsignal/src $(DOCKER_EXTRA) $(DOCKER_IMAGE) \ -v `cd .. && pwd`/:/home/libsignal/src $(DOCKER_EXTRA) $(DOCKER_IMAGE) \
sh -c "cp rust-toolchain src/; cd src/java; ./gradlew build" sh -c "cp rust-toolchain src/; cd src/java; ./gradlew build"
java_test: java_build java_test: java_build
$(DOCKER) run --rm --user $$(id -u):$$(id -g) \ $(DOCKER) run --rm --user $$(id -u):$$(id -g) \
-v `pwd`/:/home/libsignal/src $(DOCKER_EXTRA) $(DOCKER_IMAGE) \ -v `cd .. && pwd`/:/home/libsignal/src $(DOCKER_EXTRA) $(DOCKER_IMAGE) \
sh -c "cp rust-toolchain src/; cd src/java; ./gradlew test" sh -c "cp rust-toolchain src/; cd src/java; ./gradlew test"
SONATYPE_USERNAME ?= SONATYPE_USERNAME ?=
@@ -41,7 +41,7 @@ publish_java: docker_image
@[ -n "$(SIGNING_KEY)" ] || ( echo "SIGNING_KEY is not set" && false ) @[ -n "$(SIGNING_KEY)" ] || ( echo "SIGNING_KEY is not set" && false )
@[ -n "$(SIGNING_KEY_PASSWORD)" ] || ( echo "SIGNING_KEY_PASSWORD is not set" && false ) @[ -n "$(SIGNING_KEY_PASSWORD)" ] || ( echo "SIGNING_KEY_PASSWORD is not set" && false )
$(DOCKER) run --rm --user $$(id -u):$$(id -g) \ $(DOCKER) run --rm --user $$(id -u):$$(id -g) \
-v `pwd`/:/home/libsignal/src $(DOCKER_EXTRA) \ -v `cd .. && pwd`/:/home/libsignal/src $(DOCKER_EXTRA) \
-v $(KEYRING_VOLUME):/home/libsignal/keyring \ -v $(KEYRING_VOLUME):/home/libsignal/keyring \
$(DOCKER_IMAGE) \ $(DOCKER_IMAGE) \
sh -c "cp rust-toolchain src; cd src/java; ./gradlew uploadArchives \ sh -c "cp rust-toolchain src; cd src/java; ./gradlew uploadArchives \

3
java/android/build.gradle
View File

@@ -128,3 +128,6 @@ task installArchives(type: Upload) {
} }
} }
tasks.withType(JavaCompile) {
compileTask -> compileTask.dependsOn ':makeJniLibrariesAndroid'
}

11
java/build.gradle
View File

@@ -11,11 +11,18 @@ subprojects {
} }
} }
task makeJniLibraries(type:Exec) { task makeJniLibrariesAndroid(type:Exec) {
group 'Rust' group 'Rust'
description 'Build the JNI libraries' description 'Build the JNI libraries'
commandLine './build_jni.sh' commandLine './build_jni.sh', 'android'
}
task makeJniLibrariesDesktop(type:Exec) {
group 'Rust'
description 'Build the JNI libraries'
commandLine './build_jni.sh', 'desktop'
} }
task makeAll() { task makeAll() {

18
java/build_jni.sh
View File

@@ -13,8 +13,16 @@ export RUSTFLAGS="-C link-args=-s"
cd .. || exit cd .. || exit
cargo build -Z unstable-options -p libsignal-jni --release --target x86_64-unknown-linux-gnu --out-dir=$DESKTOP_LIB_DIR if [ "$1" = 'desktop' ];
cargo ndk --target armv7-linux-androideabi --platform 19 -- build -Z unstable-options -p libsignal-jni --release --out-dir=$ANDROID_LIB_DIR/armeabi-v7a then
cargo ndk --target aarch64-linux-android --platform 21 -- build -Z unstable-options -p libsignal-jni --release --out-dir=$ANDROID_LIB_DIR/arm64-v8a cargo build -Z unstable-options -p libsignal-jni --release --target x86_64-unknown-linux-gnu --out-dir=$DESKTOP_LIB_DIR
cargo ndk --target i686-linux-android --platform 19 -- build -Z unstable-options -p libsignal-jni --release --out-dir=$ANDROID_LIB_DIR/x86 elif [ "$1" = 'android' ];
cargo ndk --target x86_64-linux-android --platform 21 -- build -Z unstable-options -p libsignal-jni --release --out-dir=$ANDROID_LIB_DIR/x86_64 then
cargo ndk --target armv7-linux-androideabi --platform 19 -- build -Z unstable-options -p libsignal-jni --release --out-dir=$ANDROID_LIB_DIR/armeabi-v7a
cargo ndk --target aarch64-linux-android --platform 21 -- build -Z unstable-options -p libsignal-jni --release --out-dir=$ANDROID_LIB_DIR/arm64-v8a
cargo ndk --target i686-linux-android --platform 19 -- build -Z unstable-options -p libsignal-jni --release --out-dir=$ANDROID_LIB_DIR/x86
cargo ndk --target x86_64-linux-android --platform 21 -- build -Z unstable-options -p libsignal-jni --release --out-dir=$ANDROID_LIB_DIR/x86_64
else
echo "Unknown target (use 'desktop' or 'android')"
fi

2
java/java/build.gradle
View File

@@ -156,5 +156,5 @@ artifacts {
} }
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
compileTask -> compileTask.dependsOn ':makeJniLibraries' compileTask -> compileTask.dependsOn ':makeJniLibrariesDesktop'
} }