From 7f6b94214666e0a1429d83db9e070df85fbcbd54 Mon Sep 17 00:00:00 2001
From: Emil Sjolander <emilsj@fb.com>
Date: Wed, 12 Oct 2016 09:02:02 -0700
Subject: [PATCH] Move java rules into java directory

Summary: Move java buck rules out of the root buck file and into the java subfolder. This matches how buck should be used. Having one huge buck file is not best practice.

Reviewed By: lucasr

Differential Revision: D4008408

fbshipit-source-id: 5895c62cc8806d6a849e1b2cc6ea95c36b9d99b6
---
 .travis.yml |  2 +-
 BUCK        | 29 -----------------------------
 java/BUCK   | 45 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 30 deletions(-)
 create mode 100644 java/BUCK

diff --git a/.travis.yml b/.travis.yml
index d5e9b5c2..ffcede3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ before_install:
 
 script:
   - buck test //:CSSLayout
-  - buck test //:CSSLayout_java
+  - buck test //java:java
   - buck run  //benchmark:benchmark
   - git checkout HEAD^
   - buck run  //benchmark:benchmark
diff --git a/BUCK b/BUCK
index 07f7fbf7..07a5e0a6 100644
--- a/BUCK
+++ b/BUCK
@@ -21,7 +21,6 @@ GMOCK_OVERRIDE_FLAGS = [
 ]
 
 COMPILER_FLAGS = BASE_COMPILER_FLAGS + ['-std=c11']
-JNI_COMPILER_FLAGS = BASE_COMPILER_FLAGS + ['-std=c++11']
 TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + ['-std=c++11']
 
 cxx_library(
@@ -36,18 +35,6 @@ cxx_library(
   visibility = ['PUBLIC'],
 )
 
-cxx_library(
-  name = 'CSSLayout_jni',
-  soname = 'libcsslayout.$(ext)',
-  srcs = glob(['java/jni/*.cpp']),
-  header_namespace = '',
-  compiler_flags = JNI_COMPILER_FLAGS,
-  deps = JNI_DEPS + [
-    ':CSSLayout',
-  ],
-  visibility = ['PUBLIC'],
-)
-
 cxx_test(
   name = 'CSSLayout_tests',
   contacts = ['emilsj@fb.com'],
@@ -59,19 +46,3 @@ cxx_test(
   ],
   visibility = ['PUBLIC'],
 )
-
-java_library(
-  name = 'CSSLayout_java',
-  srcs = glob(['java/com/facebook/csslayout/*.java']),
-  tests=[':CSSLayout_java_tests'],
-  source = '1.7',
-  target = '1.7',
-  deps = [
-    ':CSSLayout_jni',
-    INFER_ANNOTATIONS_TARGET,
-    JSR_305_TARGET,
-    PROGRUARD_ANNOTATIONS_TARGET,
-    SOLOADER_TARGET,
-  ],
-  visibility = ['PUBLIC'],
-)
diff --git a/java/BUCK b/java/BUCK
new file mode 100644
index 00000000..84b79bc5
--- /dev/null
+++ b/java/BUCK
@@ -0,0 +1,45 @@
+# Copyright (c) 2014-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+include_defs('//CSSLAYOUT_DEFS')
+
+cxx_library(
+  name = 'jni',
+  soname = 'libcsslayout.$(ext)',
+  srcs = glob(['jni/*.cpp']),
+  header_namespace = '',
+  compiler_flags = [
+    '-fno-omit-frame-pointer',
+    '-fexceptions',
+    '-Wall',
+    '-Werror',
+    '-O3',
+    '-std=c++11',
+  ],
+  deps = JNI_DEPS + [
+    csslayout_dep(':CSSLayout'),
+  ],
+  visibility = ['PUBLIC'],
+)
+
+java_library(
+  name = 'java',
+  srcs = glob(['com/facebook/csslayout/*.java']),
+  tests=[
+    csslayout_dep('/java:tests'),
+  ],
+  source = '1.7',
+  target = '1.7',
+  deps = [
+    ':jni',
+    INFER_ANNOTATIONS_TARGET,
+    JSR_305_TARGET,
+    PROGRUARD_ANNOTATIONS_TARGET,
+    SOLOADER_TARGET,
+  ],
+  visibility = ['PUBLIC'],
+)