Jonathan Hart
Committed by Gerrit Code Review

Fix buck build for SDN-IP and vRouter.

Change-Id: I99aac2ce477f7a2ba0d12dd46e669a25ebcfc750
...@@ -5,8 +5,9 @@ COMPILE_DEPS = [ ...@@ -5,8 +5,9 @@ COMPILE_DEPS = [
5 ] 5 ]
6 6
7 BUNDLES = [ 7 BUNDLES = [
8 - '//apps/routing-api:onos-apps-routing-api',
9 '//apps/sdnip:onos-apps-sdnip', 8 '//apps/sdnip:onos-apps-sdnip',
9 + '//apps/routing-api:onos-apps-routing-api',
10 + '//apps/routing:onos-apps-routing',
10 ] 11 ]
11 12
12 TEST_DEPS = [ 13 TEST_DEPS = [
...@@ -25,5 +26,6 @@ onos_app ( ...@@ -25,5 +26,6 @@ onos_app (
25 category = 'Utility', 26 category = 'Utility',
26 url = 'http://onosproject.org', 27 url = 'http://onosproject.org',
27 included_bundles = BUNDLES, 28 included_bundles = BUNDLES,
29 + required_apps = [ 'org.onosproject.proxyarp' ],
28 description = 'SDN-IP peering application', 30 description = 'SDN-IP peering application',
29 ) 31 )
......
...@@ -3,7 +3,13 @@ COMPILE_DEPS = [ ...@@ -3,7 +3,13 @@ COMPILE_DEPS = [
3 '//incubator/api:onos-incubator-api', 3 '//incubator/api:onos-incubator-api',
4 ] 4 ]
5 5
6 -osgi_jar_with_tests ( 6 +BUNDLES = [
7 + '//apps/routing-api:onos-apps-routing-api',
8 + '//apps/routing:onos-apps-routing',
9 + '//apps/vrouter:onos-apps-vrouter',
10 +]
11 +
12 +osgi_jar (
7 deps = COMPILE_DEPS, 13 deps = COMPILE_DEPS,
8 ) 14 )
9 15
...@@ -11,5 +17,6 @@ onos_app ( ...@@ -11,5 +17,6 @@ onos_app (
11 title = 'Virtual Router App', 17 title = 'Virtual Router App',
12 category = 'Traffic Steering', 18 category = 'Traffic Steering',
13 url = 'http://onosproject.org', 19 url = 'http://onosproject.org',
20 + included_bundles = BUNDLES,
14 description = 'Virtual router (vRouter) application.', 21 description = 'Virtual router (vRouter) application.',
15 ) 22 )
......