Skip to content

Commit

Permalink
Revert D4875195: [litho][gradle] Set up NDK build for libfb
Browse files Browse the repository at this point in the history
Summary: This reverts commit 3442a1e9da926e4ad94f42396ae089e8e97e6835

Differential Revision: D4875195

fbshipit-source-id: f022f7a62aed41ada6892037273ae3141a00eb49
  • Loading branch information
passy authored and facebook-github-bot committed Apr 13, 2017
1 parent fc8b6a9 commit 83196a7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ docs/_site/
/.buckd
/gentest/test.html
.buckversion
/lib/yoga/.externalNativeBuild/

# Output files
build/
.externalNativeBuild/
6 changes: 3 additions & 3 deletions lib/fb/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if COMPONENTS_IS_OSS_BUILD:
cxx_library(
name = 'jni',
soname = 'libfb.$(ext)',
srcs = glob(['src/main/cpp/*.cpp', 'src/main/cpp/jni/*.cpp', 'src/main/cpp/lyra/*.cpp']),
srcs = glob(['*.cpp', 'jni/*.cpp', 'lyra/*.cpp']),
header_namespace = '',
compiler_flags = [
'-fno-omit-frame-pointer',
Expand All @@ -23,8 +23,8 @@ if COMPONENTS_IS_OSS_BUILD:
'-DDISABLE_XPLAT',
],
exported_headers = subdir_glob([
('src/main/cpp/include', 'fb/**/*.h'),
('src/main/cpp/include', 'jni/*.h'),
('include', 'fb/**/*.h'),
('include', 'jni/*.h'),
]),
deps = [
COMPONENTS_JNI_TARGET,
Expand Down
2 changes: 0 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,5 @@ include ':litho-testing'
include ':litho-widget'
include ':sample'
include ':yoga'
include ':libfb'

project(':yoga').projectDir = file('lib/yoga')
project(':libfb').projectDir = file('lib/fb')

0 comments on commit 83196a7

Please sign in to comment.