Shrink library size and preserve JNI symbols

README.md

@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'dev.romainguy:pathway:0.15.0'
+    implementation 'dev.romainguy:pathway:0.16.0'
 }
 ```
 

build.gradle

@@ -5,9 +5,9 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.0.2"
+        classpath "com.android.tools.build:gradle:8.2.0"
         classpath "com.vanniktech:gradle-maven-publish-plugin:0.25.3"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.8.20"
     }
 
@@ -29,5 +29,6 @@ buildscript {
         "-fdata-sections",
         "-Wl,--gc-sections",
         "-Wl,-Bsymbolic-functions",
+        "-nostdlib++"
     ]
 }

gradle.properties

@@ -1,5 +1,5 @@
 GROUP=dev.romainguy
-VERSION_NAME=0.15.0
+VERSION_NAME=0.16.0
 
 SONATYPE_HOST=S01
 RELEASE_SIGNING_ENABLED=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jul 12 13:05:07 PDT 2023
+#Tue Dec 12 17:22:13 PST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

pathway/build.gradle

@@ -23,6 +23,8 @@ android {
             }
         }
 
+        consumerProguardFiles "proguard-rules.pro"
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

pathway/proguard-rules.pro

@@ -0,0 +1,3 @@
+-keepclasseswithmembernames,includedescriptorclasses class dev.romainguy.graphics.path.** {
+    native <methods>;
+}

pathway/src/main/cpp/Conic.cpp

@@ -26,8 +26,6 @@
 
 using namespace filament::math;
 
-constexpr int kMaxConicToQuadCount = 5;
-
 constexpr bool isFinite(const Point points[], int count) noexcept {
     return isFinite(&points[0].x, count << 1);
 }
@@ -53,17 +51,9 @@ const Point* ConicConverter::toQuadratics(
     Conic conic(points[0], points[1], points[2], weight);
 
     int count = conic.computeQuadraticCount(tolerance);
-    mQuadraticCount = 1 << count;
-
-    int newSize = 1 + 2 * mQuadraticCount;
-    if (newSize > mStorage.size()) {
-        mStorage.resize(newSize);
-    }
-
-    Point* data = mStorage.data();
-    mQuadraticCount = conic.splitIntoQuadratics(data, count);
+    mQuadraticCount = conic.splitIntoQuadratics(mStorage, count);
 
-    return data;
+    return mStorage;
 }
 
 int Conic::computeQuadraticCount(float tolerance) const noexcept {

pathway/src/main/cpp/Conic.h

@@ -19,9 +19,8 @@
 
 #include "Path.h"
 
-#include <vector>
-
-constexpr int kDefaultQuadraticCount = 8;
+constexpr int kMaxConicToQuadCount = 5;
+constexpr int kMaxQuadraticCount = 1 << kMaxConicToQuadCount;
 
 class ConicConverter {
 public:
@@ -32,12 +31,12 @@ class ConicConverter {
     int quadraticCount() const noexcept { return mQuadraticCount; }
 
     const Point* quadratics() const noexcept {
-        return mQuadraticCount > 0 ? mStorage.data() : nullptr;
+        return mQuadraticCount > 0 ? mStorage : nullptr;
     }
 
 private:
     int mQuadraticCount = 0;
-    std::vector<Point> mStorage{1 + 2 * kDefaultQuadraticCount};
+    Point mStorage[1 + 2 * kMaxQuadraticCount];
 };
 
 struct Conic {

pathway/src/main/cpp/pathway.cpp

@@ -20,6 +20,9 @@
 
 #include <android/api-level.h>
 
+#include <cstdlib>
+#include <new>
+
 #define JNI_CLASS_NAME "dev/romainguy/graphics/path/Paths"
 
 struct {
@@ -77,14 +80,17 @@ static jlong createPathIterator(JNIEnv* env, jclass,
         direction = PathIterator::VerbDirection::Backward;
     }
 
-    return jlong(new PathIterator(
+    PathIterator* iterator = static_cast<PathIterator*>(malloc(sizeof(PathIterator)));
+    return jlong(new(iterator) PathIterator(
             points, verbs, conicWeights, count, direction,
             PathIterator::ConicEvaluation(conicEvaluation_), tolerance_
     ));
 }
 
 static void destroyPathIterator(JNIEnv*, jclass, jlong pathIterator_) {
-    delete reinterpret_cast<PathIterator*>(pathIterator_);
+    PathIterator* iterator = reinterpret_cast<PathIterator*>(pathIterator_);
+    iterator->~PathIterator();
+    free(iterator);
 }
 
 static jboolean pathIteratorHasNext(JNIEnv*, jclass, jlong pathIterator_) {

pathway/src/main/java/dev/romainguy/graphics/path/Paths.kt

@@ -103,9 +103,7 @@ class PathSegment internal constructor(val type: Type, val points: Array<PointF>
 
         if (type != other.type) return false
         if (!points.contentEquals(other.points)) return false
-        if (weight != other.weight) return false
-
-        return true
+        return weight == other.weight
     }
 
     override fun hashCode(): Int {
@@ -130,11 +128,6 @@ val DoneSegment = PathSegment(PathSegment.Type.Done, emptyArray(), 0.0f)
  */
 val CloseSegment = PathSegment(PathSegment.Type.Close, emptyArray(), 0.0f)
 
-/**
- * Cache of [PathSegment.Type] values to avoid internal allocation on each use.
- */
-private val pathSegmentTypes = PathSegment.Type.values()
-
 /**
  * Creates a new [PathIterator] for this [path][android.graphics.Path] that evaluates
  * conics as quadratics. To preserve conics, use [Path.iterator].
@@ -211,7 +204,7 @@ class PathIterator(
      * Returns the type of the current segment in the iteration, or [Done][PathSegment.Type.Done]
      * if the iteration is finished.
      */
-    fun peek() = pathSegmentTypes[internalPathIteratorPeek(internalPathIterator)]
+    fun peek() = PathSegment.Type.entries[internalPathIteratorPeek(internalPathIterator)]
 
     /**
      * Returns the [type][PathSegment.Type] of the next [path segment][PathSegment] in the iteration
@@ -236,7 +229,7 @@ class PathIterator(
     fun next(points: FloatArray, offset: Int = 0): PathSegment.Type {
         check(points.size - offset >= 8) { "The points array must contain at least 8 floats" }
         val typeValue = internalPathIteratorNext(internalPathIterator, points, offset)
-        return pathSegmentTypes[typeValue]
+        return PathSegment.Type.entries[typeValue]
     }
 
     /**
@@ -246,7 +239,7 @@ class PathIterator(
      */
     override fun next(): PathSegment {
         val typeValue = internalPathIteratorNext(internalPathIterator, pointsData, 0)
-        val type = pathSegmentTypes[typeValue]
+        val type = PathSegment.Type.entries[typeValue]
 
         if (type == PathSegment.Type.Done) return DoneSegment
         if (type == PathSegment.Type.Close) return CloseSegment
@@ -255,12 +248,14 @@ class PathIterator(
             PathSegment.Type.Move -> {
                 arrayOf(PointF(pointsData[0], pointsData[1]))
             }
+
             PathSegment.Type.Line -> {
                 arrayOf(
                     PointF(pointsData[0], pointsData[1]),
                     PointF(pointsData[2], pointsData[3])
                 )
             }
+
             PathSegment.Type.Quadratic,
             PathSegment.Type.Conic -> {
                 arrayOf(
@@ -269,6 +264,7 @@ class PathIterator(
                     PointF(pointsData[4], pointsData[5])
                 )
             }
+
             PathSegment.Type.Cubic -> {
                 arrayOf(
                     PointF(pointsData[0], pointsData[1]),
@@ -291,29 +287,22 @@ class PathIterator(
     }
 }
 
-@Suppress("KotlinJniMissingFunction")
 private external fun createInternalPathIterator(
     path: Path, conicEvaluation: Int, tolerance: Float
 ): Long
 
-@Suppress("KotlinJniMissingFunction")
 private external fun destroyInternalPathIterator(internalPathIterator: Long)
 
-@Suppress("KotlinJniMissingFunction")
 private external fun internalPathIteratorHasNext(internalPathIterator: Long): Boolean
 
-@Suppress("KotlinJniMissingFunction")
 private external fun internalPathIteratorNext(
     internalPathIterator: Long,
     points: FloatArray,
     offset: Int
 ): Int
 
-@Suppress("KotlinJniMissingFunction")
 private external fun internalPathIteratorPeek(internalPathIterator: Long): Int
 
-@Suppress("KotlinJniMissingFunction")
 private external fun internalPathIteratorRawSize(internalPathIterator: Long): Int
 
-@Suppress("KotlinJniMissingFunction")
 private external fun internalPathIteratorSize(internalPathIterator: Long): Int