Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 2065dd6c authored by Michael Bestas's avatar Michael Bestas
Browse files

Rename jni libs back to their original names 

Change-Id: I1a800b87b624c36dcd0d951ef79942929237b5ed
parent cbcd7b22

Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ android_app { 
    sdk_version: "current",



    jni_libs: [

        "libjni_gallery_eglfence",

        "libjni_gallery_filters",

        "libjni_gallery_jpegstream",

        "libjni_eglfence",

        "libjni_filtershow_filters",

        "libjni_jpegstream",

    ],



    optimize: {

gallerycommon/src/com/android/gallery3d/jpegstream/JPEGInputStream.java

+1 −1
Original line number Diff line number Diff line
@@ -188,6 +188,6 @@ public class JPEGInputStream extends FilterInputStream { 
    native private int skipDecodedBytes(int bytes);



    static {

        System.loadLibrary("jni_gallery_jpegstream");

        System.loadLibrary("jni_jpegstream");

    }

}

gallerycommon/src/com/android/gallery3d/jpegstream/JPEGOutputStream.java

+1 −1
Original line number Diff line number Diff line
@@ -139,6 +139,6 @@ public class JPEGOutputStream extends FilterOutputStream { 
    native private int writeInputBytes(byte[] inBuffer, int offset, int inCount);



    static {

        System.loadLibrary("jni_gallery_jpegstream");

        System.loadLibrary("jni_jpegstream");

    }

}

jni/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ cc_defaults { 
}



cc_library_shared {

    name: "libjni_gallery_eglfence",

    name: "libjni_eglfence",

    defaults: ["gallery2_jni_defaults"],



    cflags: ["-DEGL_EGLEXT_PROTOTYPES"],
@@ -27,7 +27,7 @@ cc_library_shared { 


// Filtershow

cc_library_shared {

    name: "libjni_gallery_filters",

    name: "libjni_filtershow_filters",

    defaults: ["gallery2_jni_defaults"],



    srcs: [

jni_jpegstream/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ package { 
}



cc_library_shared {

    name: "libjni_gallery_jpegstream",

    name: "libjni_jpegstream",

    product_specific: true,



    static_libs: ["libjpeg_static_ndk"],