Move java api to extras/

Change-Id: Ibd5cbbdfb22a235442cddaebc9eae9a3c4e35ec9
Signed-off-by: Damjan Marion <damarion@cisco.com>
diff --git a/build-data/packages/japi.mk b/build-data/packages/japi.mk
new file mode 100644
index 0000000..d643593
--- /dev/null
+++ b/build-data/packages/japi.mk
@@ -0,0 +1,6 @@
+japi_configure_depend = vpp-install
+japi_source = extras
+japi_configure_subdir = japi
+japi_CPPFLAGS = $(call installed_includes_fn, vpp) $(call installed_includes_fn, vpp)/vpp_plugins
+japi_LDFLAGS = $(call installed_libs_fn, vpp)
+
diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index d555f2a..a8bd44e 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -86,7 +86,7 @@
 	   >> deb/debian/vpp-dev.install ;				\
 	echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/share/vpp/JSON.py /usr/share/vpp \
 	   >> deb/debian/vpp-dev.install ;				\
-	echo ../../src/vpp-api/java/jvpp/gen/jvpp_gen.py /usr/bin	\
+	echo ../../extras/japi/java/jvpp/gen/jvpp_gen.py /usr/bin	\
 	   >> deb/debian/vpp-dev.install ;				\
 	for i in $$(ls ../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do	\
 	   echo ../$${i} /usr/lib/python2.7/dist-packages/jvppgen	\
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 5e4980a..0687946 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -26,7 +26,7 @@
 # Uncoment to enable building unit tests
 # vpp_enable_tests = yes
 
-vpp_root_packages = vpp vom
+vpp_root_packages = vpp vom japi
 
 # DPDK configuration parameters
 # vpp_uses_dpdk_mlx4_pmd = yes