Fixes for buck regressions

Change-Id: I40e6a68392d229bf2827e115a54c0d66fd39b2d4

@@ -32,6 +32,8 @@ DEPS = [
     '//protocols/pcep/pcepio:onos-pcep-pcepio',
     '//protocols/pcep/api:onos-pcep-controller-api',
     '//protocols/pcep/ctl:onos-pcep-ctl',
+    '//protocols/isis:onos-isis-api',
+    '//protocols/isis:onos-isis-isisio',
 
     '//drivers/utilities:onos-drivers-utilities',
     '//drivers/ciena:onos-drivers-ciena',

+SRC = 'src/main/java/org/onosproject/**/'
+TEST = 'src/main/java/org/onosproject/**/'
+
+COMPILE_DEPS = [
+    '//lib:CORE_DEPS',
+    '//lib:netty-buffer',
+    #'//lib:netty-'
+    #'//lib:org.apache.karaf.shell.console',
+    #'//cli:onos-cli',
+    #'//utils/rest:onlab-rest',
+    #'//lib:javax.ws.rs-api',
+    #'//core/store/serializers:onos-core-serializers',
+    #'//incubator/api:onos-incubator-api',
+]
+
+TEST_DEPS = [
+    '//lib:TEST',
+]
+
+java_library(
+   name = 'onos-isis',
+   visibility = ['PUBLIC'],
+   deps = [':onos-isis-api',
+           ':onos-isis-isisio',
+   ],
+)
+
+# onos-isis-api
+
+java_library(
+    name = 'onos-isis-api',
+    srcs = glob(['api/' + SRC + '*.java']),
+    deps = COMPILE_DEPS,
+    visibility = ['PUBLIC'],
+)
+
+java_test(
+    name = 'onos-isis-api-tests',
+    srcs = glob(['api/' + TEST + '*.java']),
+    deps = COMPILE_DEPS +
+           TEST_DEPS +
+           [':onos-isis-api'],
+    source_under_test = [':onos-isis-api'],
+)
+
+# onos-isis-isisio
+
+java_library(
+    name = 'onos-isis-isisio',
+    srcs = glob(['isisio/' + SRC + '*.java']),
+    deps = COMPILE_DEPS + [':onos-isis-api'],
+    visibility = ['PUBLIC'],
+)
+
+java_test(
+    name = 'onos-isis-isisio-tests',
+    srcs = glob(['isisio/' + TEST + '*.java']),
+    deps = COMPILE_DEPS +
+           TEST_DEPS +
+           [':onos-isis-isisio'],
+    source_under_test = [':onos-isis-isisio'],
+)
+

@@ -8,6 +8,7 @@ COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:javax.ws.rs-api',
     '//utils/rest:onlab-rest',
+    '//incubator/api:onos-incubator-api',
 ]
 
 TEST_DEPS = [