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

Commit 2416f131 authored by Leon Scroggins's avatar Leon Scroggins Committed by Android (Google) Code Review
Browse files

Merge "Support building libjnigraphics on the host"

parents d26cd28b 726a5508

include/android/bitmap.h

+17 −2
Original line number Diff line number Diff line
@@ -28,8 +28,23 @@ 


#include <stdbool.h>

#include <stdint.h>

#include <stddef.h>

#include <jni.h>



#ifndef __ANDROID__

    // Value copied from 'bionic/libc/include/android/api-level.h' which is not available on

    // non Android systems. It is set to 10000 which is same as __ANDROID_API_FUTURE__ value.

    #ifndef __ANDROID_API__

        #define __ANDROID_API__ 10000

    #endif



    // Value copied from 'bionic/libc/include/android/versioning.h' which is not available on

    // non Android systems

    #ifndef __INTRODUCED_IN

        #define __INTRODUCED_IN(api_level)

    #endif

#endif



#ifdef __cplusplus

extern "C" {

#endif
@@ -152,8 +167,6 @@ int AndroidBitmap_lockPixels(JNIEnv* env, jobject jbitmap, void** addrPtr); 
 */

int AndroidBitmap_unlockPixels(JNIEnv* env, jobject jbitmap);



#if __ANDROID_API__ >= 30



// Note: these values match android.graphics.Bitmap#compressFormat.



/**
@@ -203,6 +216,8 @@ typedef bool (*AndroidBitmap_CompressWriteFunc)(void* userContext, 
                                                const void* data,

                                                size_t size) __INTRODUCED_IN(30);



#if __ANDROID_API__ >= 30



/**

 *  Compress |pixels| as described by |info|.

 *

include/android/imagedecoder.h

+14 −0
Original line number Diff line number Diff line
@@ -51,6 +51,20 @@ 
#include <android/rect.h>

#include <stdint.h>



#ifndef __ANDROID__

    // Value copied from 'bionic/libc/include/android/api-level.h' which is not available on

    // non Android systems. It is set to 10000 which is same as __ANDROID_API_FUTURE__ value.

    #ifndef __ANDROID_API__

        #define __ANDROID_API__ 10000

    #endif



    // Value copied from 'bionic/libc/include/android/versioning.h' which is not available on

    // non Android systems

    #ifndef __INTRODUCED_IN

        #define __INTRODUCED_IN(api_level)

    #endif

#endif



#ifdef __cplusplus

extern "C" {

#endif

libs/nativewindow/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ cc_library_headers { 
    // TODO(b/153609531): remove when no longer needed.

    native_bridge_supported: true,

    min_sdk_version: "29",

    host_supported: true,

}



ndk_library {