DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Fix some issues with the deploy script and deploy a new version for android

Browse Source 
Summary: Fix some issues with the deploy script and deploy a new version for android

Reviewed By: passy

Differential Revision: D4876006

fbshipit-source-id: ddafb8349e1c77ab5afd9a823103fb6a1dfabb1d
This commit is contained in:
Emil Sjolander
2017-04-12 09:52:30 -07:00
committed by Facebook Github Bot
parent 5f050cb590
commit c080a46571
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/build.gradle
View File

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
targetCompatibility = '1.7' targetCompatibility = '1.7'
sourceCompatibility = '1.7' sourceCompatibility = '1.7'
version = '1.4.0' version = '1.4.1'
group = 'com.facebook.yoga.android' group = 'com.facebook.yoga.android'
android { android {
@@ -25,7 +25,7 @@ android {
} }
dependencies { dependencies {
compile 'com.facebook.yoga:yoga:1.2.0' compile 'com.facebook.yoga:yoga:1.4.1'
} }
task sourcesJar(type: Jar) { task sourcesJar(type: Jar) {

4
java/build.gradle
View File

@@ -6,13 +6,13 @@ apply plugin: 'maven-publish'
targetCompatibility = '1.7' targetCompatibility = '1.7'
sourceCompatibility = '1.7' sourceCompatibility = '1.7'
version = '1.4.0' version = '1.4.1'
group = 'com.facebook.yoga' group = 'com.facebook.yoga'
// We currently build the native libraries with buck and bundle them together // We currently build the native libraries with buck and bundle them together
// at this point into the AAR // at this point into the AAR
task buckBuildAndCopy(type: Exec) { task buckBuildAndCopy(type: Exec) {
commandLine '../scripts/build_natives_for_gradle.sh' commandLine "$rootDir/scripts/build_natives_for_gradle.sh"
} }
android { android {

23
scripts/build_natives_for_gradle.sh
View File

@@ -1,5 +1,8 @@
#!/bin/bash #!/bin/bash
set -e
BASEDIR=$(dirname $0)
DESTINATIONS=( DESTINATIONS=(
"build/buck-out/jniLibs/x86" "build/buck-out/jniLibs/x86"
"build/buck-out/jniLibs/x86_64" "build/buck-out/jniLibs/x86_64"
@@ -22,22 +25,22 @@ done
# There must be a better way to get gnustl_shared than building the android target. # There must be a better way to get gnustl_shared than building the android target.
# But for now, we include that target simply for that shared library... # But for now, we include that target simply for that shared library...
echo "Build libgnustl_shared.so" echo "Build libgnustl_shared.so"
~/mybuck/bin/buck build //android/sample:sample buck build //android/sample:sample
cp "../buck-out/gen/android/sample/sample#X86,android-strip,libgnustl_shared.so/libgnustl_shared.so" "${DESTINATIONS[0]}" cp "$BASEDIR/../buck-out/gen/android/sample/sample#X86,android-strip,libgnustl_shared.so/libgnustl_shared.so" "${DESTINATIONS[0]}"
cp "../buck-out/gen/android/sample/sample#X86_64,android-strip,libgnustl_shared.so/libgnustl_shared.so" "${DESTINATIONS[1]}" cp "$BASEDIR/../buck-out/gen/android/sample/sample#X86_64,android-strip,libgnustl_shared.so/libgnustl_shared.so" "${DESTINATIONS[1]}"
cp "../buck-out/gen/android/sample/sample#ARMV7,android-strip,libgnustl_shared.so/libgnustl_shared.so" "${DESTINATIONS[2]}" cp "$BASEDIR/../buck-out/gen/android/sample/sample#ARMV7,android-strip,libgnustl_shared.so/libgnustl_shared.so" "${DESTINATIONS[2]}"
cp "../buck-out/gen/android/sample/sample#ARM64,android-strip,libgnustl_shared.so/libgnustl_shared.so" "${DESTINATIONS[3]}" cp "$BASEDIR/../buck-out/gen/android/sample/sample#ARM64,android-strip,libgnustl_shared.so/libgnustl_shared.so" "${DESTINATIONS[3]}"
# This is to clean up after the mess above. Yes, it is required. # This is to clean up after the mess above. Yes, it is required.
~/mybuck/bin/buck clean buck clean
rm -r ../buck-out rm -r "$BASEDIR/../buck-out"
for (( i=0; i<4; i++ )); for (( i=0; i<4; i++ ));
do do
echo "Build ${BUCK_TARGETS[i]}" echo "Build ${BUCK_TARGETS[i]}"
buck build "//java:jni#${BUCK_TARGETS[i]},shared" buck build "//java:jni#${BUCK_TARGETS[i]},shared"
cp "../buck-out/gen/java/jni#${BUCK_TARGETS[i]},shared/libyoga.so" "${DESTINATIONS[i]}" cp "$BASEDIR/../buck-out/gen/java/jni#${BUCK_TARGETS[i]},shared/libyoga.so" "${DESTINATIONS[i]}"
cp "../buck-out/gen/yoga#${BUCK_TARGETS[i]},shared/libyogacore.so" "${DESTINATIONS[i]}" cp "$BASEDIR/../buck-out/gen/yoga#${BUCK_TARGETS[i]},shared/libyogacore.so" "${DESTINATIONS[i]}"
cp "../buck-out/gen/lib/fb/fbjni#${BUCK_TARGETS[i]},shared/liblib_fb_fbjni.so" "${DESTINATIONS[i]}" cp "$BASEDIR/../buck-out/gen/lib/fb/fbjni#${BUCK_TARGETS[i]},shared/liblib_fb_fbjni.so" "${DESTINATIONS[i]}"
done done