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

Commit 4ed3557b authored by Colin Cross's avatar Colin Cross
Browse files

Convert libjnigraphics to Android.bp 

See build/soong/README.md for more information.

Test: m -j
Change-Id: If302f63276fa815423f50df0f12c1700975dbc43
Merged-In: If302f63276fa815423f50df0f12c1700975dbc43
(cherry picked from commit 02a86578)
parent ed8d2363

native/graphics/jni/Android.bp

+27 −0
Original line number Diff line number Diff line
@@ -12,6 +12,33 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



cc_library_shared {

    name: "libjnigraphics",



    cflags: [

        "-Wall",

        "-Werror",

        "-Wunused",

        "-Wunreachable-code",

    ],



    // our source files

    //

    srcs: ["bitmap.cpp"],



    shared_libs: [

        "libandroid_runtime",

        "libskia",

    ],



    arch: {

        arm: {

            // TODO: This is to work around b/24465209. Remove after root cause is fixed

            ldflags: ["-Wl,--hash-style=both"],

        },

    },

}



// The headers module is in frameworks/native/Android.bp.

ndk_library {

    name: "libjnigraphics",

native/graphics/jni/Android.mk

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
BASE_PATH := $(call my-dir)

LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)



# setup for skia optimizations

#

ifneq ($(ARCH_ARM_HAVE_VFP),true)

    LOCAL_CFLAGS += -DSK_SOFTWARE_FLOAT

endif



ifeq ($(ARCH_ARM_HAVE_NEON),true)

    LOCAL_CFLAGS += -D__ARM_HAVE_NEON

endif



# our source files

#

LOCAL_SRC_FILES:= \

    bitmap.cpp



LOCAL_SHARED_LIBRARIES := \

    libandroid_runtime \

    libskia \

    libui \

    libandroidfw



LOCAL_C_INCLUDES += \

    frameworks/base/native/include \

    frameworks/base/core/jni/android/graphics \

    frameworks/base/libs/hwui



LOCAL_MODULE:= libjnigraphics



LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code



# TODO: This is to work around b/24465209. Remove after root cause is fixed

LOCAL_LDFLAGS_arm := -Wl,--hash-style=both



include $(BUILD_SHARED_LIBRARY)

native/graphics/jni/bitmap.cpp

+1 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */



#include <android/bitmap.h>

#include <Bitmap.h>

#include <android/graphics/Bitmap.h>



int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap,

                          AndroidBitmapInfo* info) {
@@ -56,4 +56,3 @@ int AndroidBitmap_unlockPixels(JNIEnv* env, jobject jbitmap) { 
    }

    return ANDROID_BITMAP_RESULT_SUCCESS;

}