Skip to content

Commit

Permalink
fix the JNI output path (#1015)
Browse files Browse the repository at this point in the history
Summary:
Pull Request resolved: #1015

Pull Request resolved: #1014

Differential Revision: D62434222
  • Loading branch information
zielinskimz authored and facebook-github-bot committed Sep 10, 2024
1 parent 89f320a commit 3742a18
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ ext.deps = [
supportDynamicAnimations : 'androidx.dynamicanimation:dynamicanimation-ktx:1.0.0-alpha03',
// lifecycle
lifecycle : 'androidx.lifecycle:lifecycle-runtime:2.6.1',
lifecycleService : 'androidx.lifecycle:lifecycle-service:2.6.1',
viewModel : 'androidx.lifecycle:lifecycle-viewmodel:2.3.1',
liveData : 'androidx.lifecycle:lifecycle-livedata:2.6.1',
// First-party
Expand Down Expand Up @@ -207,7 +208,7 @@ ext.deps.yoga =
// This should hopefully only serve as a temporary measure until
// we have a proper Gradle setup for Yoga and JNI.
task copyYogaLibs(type: Copy, dependsOn: ':yoga:buckBuild') {
from 'buck-out/gen/lib/yogajni/jni#default,shared/'
from 'buck-out/gen/lib/yogajni/jni#default,static/'
include '*.so'
include '*.dylib'
include '*.dll'
Expand Down
2 changes: 1 addition & 1 deletion lib/yoga/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ task buckBuild(type: Exec) {
commandLine buckPath, 'build', '//lib/yogajni:jni[shared]', '--show-output'
doLast {
System.out.println("[Yoga Buck Build]: exit value: ${executionResult.get().exitValue}")
def build_outputs = executionResult.get().exitValue.trim()
def build_outputs = 'find buck-out/gen/lib/yogajni/jni#default,static/'.execute().text.trim()
System.out.println("[Yoga Buck Build]: build outputs:\n${build_outputs}")
}
}
1 change: 1 addition & 0 deletions litho-rendercore/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ dependencies {
compileOnly deps.supportAnnotations
implementation deps.supportCore
implementation deps.lifecycle
implementation deps.lifecycleService

testImplementation deps.assertjCore
testImplementation deps.junit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ class MountStateTest {
@Test
fun onMountNestedRenderTree_MountStateShouldHostExpectedState() {
val c: Context = RuntimeEnvironment.application
val root: LayoutResult? =
val root: LayoutResult =
SimpleLayoutResult.create()
.width(1000)
.height(1000)
Expand Down Expand Up @@ -560,7 +560,7 @@ class MountStateTest {
val unbindOrder: MutableList<Any?> = ArrayList()
val bindBinder = TestBinder<Any>(bindOrder, unbindOrder)
val mountBinder = TestBinder<Any>(bindOrder, unbindOrder)
val root: LayoutResult? =
val root: LayoutResult =
SimpleLayoutResult.create()
.width(200)
.height(200)
Expand Down Expand Up @@ -600,7 +600,7 @@ class MountStateTest {
val unbindOrder: MutableList<Any?> = ArrayList()
val attachBinder = TestBinder<Any>(bindOrder, unbindOrder)
val mountBinder = TestBinder<Any>(bindOrder, unbindOrder)
val root: LayoutResult? =
val root: LayoutResult =
SimpleLayoutResult.create()
.width(200)
.height(200)
Expand Down Expand Up @@ -646,7 +646,7 @@ class MountStateTest {
val unbindOrder: MutableList<Any?> = ArrayList()
val attachBinder = TestBinder<Any>(bindOrder, unbindOrder)
val mountBinder = TestBinder<Any>(bindOrder, unbindOrder)
val root: LayoutResult? =
val root: LayoutResult =
SimpleLayoutResult.create()
.width(200)
.height(200)
Expand Down Expand Up @@ -690,7 +690,7 @@ class MountStateTest {
@Test
fun onNotifyMountUnmount_ShouldUpdateMountItemCount() {
val c: Context = RuntimeEnvironment.application
val root: LayoutResult? =
val root: LayoutResult =
SimpleLayoutResult.create()
.width(1000)
.height(1000)
Expand Down Expand Up @@ -761,7 +761,7 @@ class MountStateTest {
"""
.trimIndent())
val c = renderCoreTestRule.context
val root: LayoutResult? =
val root: LayoutResult =
SimpleLayoutResult.create()
.renderUnit(ViewWrapperUnit(LinearLayout(c), 1))
.width(100)
Expand All @@ -785,7 +785,7 @@ class MountStateTest {
val unbindOrder: MutableList<Any?> = ArrayList()
val bindBinder = TestBinderWithBindData<Any>(bindOrder, unbindOrder, 1)
val mountBinder = TestBinderWithBindData<Any>(bindOrder, unbindOrder, 2)
val root: LayoutResult? =
val root: LayoutResult =
SimpleLayoutResult.create()
.width(200)
.height(200)
Expand Down

0 comments on commit 3742a18

Please sign in to comment.