From 36ebd15abc713f7c649f86b4df83f4009d716f90 Mon Sep 17 00:00:00 2001
From: Noel Eck <noel.eck@intel.com>
Date: Wed, 17 Jan 2018 13:36:19 -0800
Subject: [PATCH] java_blacklist: Enable Java blacklisted modules

Enable building java wrappers for a few that were previously
blacklisted.

Signed-off-by: Noel Eck <noel.eck@intel.com>
---
 src/CMakeLists.txt                | 2 +-
 src/javaswig_blacklist            | 4 ----
 src/kxcjk1013/javaupm_kxcjk1013.i | 7 +++++++
 src/l3gd20/javaupm_l3gd20.i       | 7 +++++++
 src/mmc35240/javaupm_mmc35240.i   | 8 ++++++++
 src/nrf8001/javaupm_nrf8001.i     | 8 ++++++++
 6 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 src/kxcjk1013/javaupm_kxcjk1013.i
 create mode 100644 src/l3gd20/javaupm_l3gd20.i
 create mode 100644 src/mmc35240/javaupm_mmc35240.i
 create mode 100644 src/nrf8001/javaupm_nrf8001.i

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dd9d623e..bbb91782 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -119,7 +119,7 @@ endfunction (_gen_pkg_config_per_target)
 # writes a pom file to each build directory
 function (_gen_pom_per_target)
   # Remove targets listed in the JAVA blacklist from pom file generation
-  list(REMOVE_ITEM ARGN ${JAVASWIG_BLACKLIST})
+  list(REMOVE_ITEM ARGN JAVASWIG_BLACKLIST)
 
   list(LENGTH ARGN n_targets)
   message(STATUS "Generating pom files for ${n_targets} CXX libraries...")
diff --git a/src/javaswig_blacklist b/src/javaswig_blacklist
index bd6a23fc..e69de29b 100644
--- a/src/javaswig_blacklist
+++ b/src/javaswig_blacklist
@@ -1,4 +0,0 @@
-nrf8001
-kxcjk1013
-l3gd20
-mmc35240
diff --git a/src/kxcjk1013/javaupm_kxcjk1013.i b/src/kxcjk1013/javaupm_kxcjk1013.i
new file mode 100644
index 00000000..8251ec95
--- /dev/null
+++ b/src/kxcjk1013/javaupm_kxcjk1013.i
@@ -0,0 +1,7 @@
+%module javaupm_kxcjk1013
+
+%{
+    #include "kxcjk1013.hpp"
+%}
+
+%include "kxcjk1013.hpp"
diff --git a/src/l3gd20/javaupm_l3gd20.i b/src/l3gd20/javaupm_l3gd20.i
new file mode 100644
index 00000000..a6f48c33
--- /dev/null
+++ b/src/l3gd20/javaupm_l3gd20.i
@@ -0,0 +1,7 @@
+%module javaupm_l3gd20
+
+%{
+    #include "l3gd20.hpp"
+%}
+
+%include "l3gd20.hpp"
diff --git a/src/mmc35240/javaupm_mmc35240.i b/src/mmc35240/javaupm_mmc35240.i
new file mode 100644
index 00000000..8a6cf9ab
--- /dev/null
+++ b/src/mmc35240/javaupm_mmc35240.i
@@ -0,0 +1,8 @@
+%module javaupm_mmc35240
+%include "../upm.i"
+
+%{
+    #include "mmc35240.hpp"
+%}
+
+%include "mmc35240.hpp"
diff --git a/src/nrf8001/javaupm_nrf8001.i b/src/nrf8001/javaupm_nrf8001.i
new file mode 100644
index 00000000..43d03be1
--- /dev/null
+++ b/src/nrf8001/javaupm_nrf8001.i
@@ -0,0 +1,8 @@
+%module javaupm_nrf8001
+%include "../upm.i"
+
+%{
+    #include "nrf8001.hpp"
+%}
+
+%include "nrf8001.hpp"