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

Commit b0ff56b7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Support building libjnigraphics on the host" am: 07278cc9 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1573920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa036031b9c053a0971290e04775ca229ad7046b
parents 9f8f0122 07278cc9

include/android/bitmap.h

+15 −0
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

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 {