[android] #5885 - fix invalid jobject error and some build system updates

4 files changed, 62 insertions, 36 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java
index 4e0f5f8c41..a75c081202 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/RuntimeStyleActivity.java
@@ -159,7 +159,7 @@ public class RuntimeStyleActivity extends AppCompatActivity {
         for (String roadLayer : roadLayers) {
             Layer layer = mapboxMap.getLayer(roadLayer);
             if (layer != null) {
-                layer.setProperties(visibility(VISIBLE));
+                layer.setProperties(visibility(NONE));
             }
         }
     }
diff --git a/platform/android/config.cmake b/platform/android/config.cmake
index af9ea99455..cc9a38c3a8 100644
--- a/platform/android/config.cmake
+++ b/platform/android/config.cmake
@@ -38,38 +38,6 @@ macro(mbgl_platform_core)
         PRIVATE platform/android/src/log_android.cpp
         PRIVATE platform/default/string_stdlib.cpp
 
-        # Conversion
-        PRIVATE platform/android/src/conversion/constant.hpp
-        PRIVATE platform/android/src/conversion/conversion.hpp
-        PRIVATE platform/android/src/style/conversion/function.hpp
-        PRIVATE platform/android/src/style/conversion/property_value.hpp
-        PRIVATE platform/android/src/style/conversion/types.hpp
-        PRIVATE platform/android/src/style/conversion/types_string_values.hpp
-
-        # Style
-        PRIVATE platform/android/src/style/value.cpp
-        PRIVATE platform/android/src/style/value.hpp
-        PRIVATE platform/android/src/style/layers/background_layer.cpp
-        PRIVATE platform/android/src/style/layers/background_layer.hpp
-        PRIVATE platform/android/src/style/layers/circle_layer.cpp
-        PRIVATE platform/android/src/style/layers/circle_layer.hpp
-        PRIVATE platform/android/src/style/layers/custom_layer.cpp
-        PRIVATE platform/android/src/style/layers/custom_layer.hpp
-        PRIVATE platform/android/src/style/layers/fill_layer.cpp
-        PRIVATE platform/android/src/style/layers/fill_layer.hpp
-        PRIVATE platform/android/src/style/layers/layer.cpp
-        PRIVATE platform/android/src/style/layers/layer.hpp
-        PRIVATE platform/android/src/style/layers/layers.cpp
-        PRIVATE platform/android/src/style/layers/layers.hpp
-        PRIVATE platform/android/src/style/layers/line_layer.cpp
-        PRIVATE platform/android/src/style/layers/line_layer.hpp
-        PRIVATE platform/android/src/style/layers/raster_layer.cpp
-        PRIVATE platform/android/src/style/layers/raster_layer.hpp
-        PRIVATE platform/android/src/style/layers/symbol_layer.cpp
-        PRIVATE platform/android/src/style/layers/symbol_layer.hpp
-        PRIVATE platform/android/src/style/sources/sources.cpp
-        PRIVATE platform/android/src/style/sources/sources.hpp
-
         # Image handling
         PRIVATE platform/default/image.cpp
         PRIVATE platform/default/png_reader.cpp
@@ -91,6 +59,11 @@ macro(mbgl_platform_core)
     target_add_mason_package(mbgl-core PUBLIC geojson)
     target_add_mason_package(mbgl-core PUBLIC jni.hpp)
 
+    target_compile_options(mbgl-core
+        PRIVATE -fvisibility=hidden
+        PRIVATE -Os
+    )
+
     target_link_libraries(mbgl-core
         PUBLIC -llog
         PUBLIC -landroid
@@ -103,8 +76,47 @@ macro(mbgl_platform_core)
 endmacro()
 
 add_library(mapbox-gl SHARED
+    # Conversion C++ -> Java
+    platform/android/src/conversion/constant.hpp
+    platform/android/src/conversion/conversion.hpp
+    platform/android/src/style/conversion/function.hpp
+    platform/android/src/style/conversion/property_value.hpp
+    platform/android/src/style/conversion/types.hpp
+    platform/android/src/style/conversion/types_string_values.hpp
+
+    # Style conversion Java -> C++
+    platform/android/src/style/android_conversion.hpp
+    platform/android/src/style/android_geojson.hpp
+    platform/android/src/style/value.cpp
+    platform/android/src/style/value.hpp
+
+    # Style
+    platform/android/src/style/layers/background_layer.cpp
+    platform/android/src/style/layers/background_layer.hpp
+    platform/android/src/style/layers/circle_layer.cpp
+    platform/android/src/style/layers/circle_layer.hpp
+    platform/android/src/style/layers/custom_layer.cpp
+    platform/android/src/style/layers/custom_layer.hpp
+    platform/android/src/style/layers/fill_layer.cpp
+    platform/android/src/style/layers/fill_layer.hpp
+    platform/android/src/style/layers/layer.cpp
+    platform/android/src/style/layers/layer.hpp
+    platform/android/src/style/layers/layers.cpp
+    platform/android/src/style/layers/layers.hpp
+    platform/android/src/style/layers/line_layer.cpp
+    platform/android/src/style/layers/line_layer.hpp
+    platform/android/src/style/layers/raster_layer.cpp
+    platform/android/src/style/layers/raster_layer.hpp
+    platform/android/src/style/layers/symbol_layer.cpp
+    platform/android/src/style/layers/symbol_layer.hpp
+    platform/android/src/style/sources/sources.cpp
+    platform/android/src/style/sources/sources.hpp
+
+    # Native map
     platform/android/src/native_map_view.cpp
     platform/android/src/native_map_view.hpp
+
+    # Main jni bindings
     platform/android/src/jni.cpp
     platform/android/src/jni.hpp
     platform/android/src/attach_env.cpp
@@ -113,6 +125,13 @@ add_library(mapbox-gl SHARED
     platform/android/src/java_types.hpp
 )
 
+target_add_mason_package(mapbox-gl PUBLIC rapidjson)
+
+target_compile_options(mapbox-gl
+    PRIVATE -fvisibility=hidden
+    PRIVATE -Os
+)
+
 target_link_libraries(mapbox-gl
     PUBLIC mbgl-core
 )
@@ -121,6 +140,11 @@ add_library(example-custom-layer SHARED
     platform/android/src/example_custom_layer.cpp
 )
 
+target_compile_options(example-custom-layer
+    PRIVATE -fvisibility=hidden
+    PRIVATE -Os
+)
+
 target_link_libraries(example-custom-layer
     PRIVATE mbgl-core
 )
diff --git a/platform/android/scripts/toolchain.sh b/platform/android/scripts/toolchain.sh
index 73d78d7248..cc8d64fc14 100755
--- a/platform/android/scripts/toolchain.sh
+++ b/platform/android/scripts/toolchain.sh
@@ -17,5 +17,5 @@ echo "set(CMAKE_C_COMPILER \"`which $(mason env CC)`\")"
 echo "set(ANDROID_JNIDIR \"`mason env JNIDIR`\")"
 echo "set(ANDROID_ABI \"\${ANDROID_JNIDIR}\")"
 echo "set(CMAKE_EXE_LINKER_FLAGS \"`mason env LDFLAGS` \${CMAKE_EXE_LINKER_FLAGS}\")"
-echo "set(CMAKE_CXX_FLAGS \"-s -fvisibility=hidden -Os `mason env CXXFLAGS` \${CMAKE_CXX_FLAGS}\")"
-echo "set(CMAKE_C_FLAGS \"-s -fvisibility=hidden -Os `mason env CPPFLAGS` \${CMAKE_C_FLAGS}\")"
+echo "set(CMAKE_CXX_FLAGS \"-s `mason env CXXFLAGS` \${CMAKE_CXX_FLAGS}\")"
+echo "set(CMAKE_C_FLAGS \"`mason env CPPFLAGS` \${CMAKE_C_FLAGS}\")"
diff --git a/platform/android/src/style/conversion/function.hpp b/platform/android/src/style/conversion/function.hpp
index ad09ce02d2..26dd5c21fd 100644
--- a/platform/android/src/style/conversion/function.hpp
+++ b/platform/android/src/style/conversion/function.hpp
@@ -23,7 +23,9 @@ inline jni::jobject* toFunctionStopJavaArray(jni::JNIEnv& env, std::vector<std::
     jni::jarray<jni::jobject>& jarray = jni::NewObjectArray(env, value.size(), *javaClass);
 
     for(size_t i = 0; i < value.size(); i = i + 1) {
-        jni::SetObjectArrayElement(env, jarray, i, &jni::NewObject(env, *javaClass, *constructor, value[i].first, *convert<jni::jobject*, T>(env, value[i].second)));
+        jni::jobject* in = *convert<jni::jobject*, float>(env, value[i].first);
+        jni::jobject* out = *convert<jni::jobject*, T>(env, value[i].second);
+        jni::SetObjectArrayElement(env, jarray, i, &jni::NewObject(env, *javaClass, *constructor, in, out));
     }
 
     return &jarray;