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

Commit 2598c975 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "binder: make recovery_available." am: 0c872e3a 

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

Change-Id: I9ff4480a5c2e2e5c067bfffd04c5141506b2b17f
parents 7faaa321 0c872e3a

libs/android_runtime_lazy/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -42,12 +42,13 @@ package { 
cc_library {

    name: "libandroid_runtime_lazy",

    vendor_available: true,

    recovery_available: true,

    double_loadable: true,

    host_supported: true,

    target: {

        darwin: {

            enabled: false,

        }

        },

    },



    cflags: [

libs/binder/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ cc_library_headers { 
    name: "libbinder_headers",

    export_include_dirs: ["include"],

    vendor_available: true,

    recovery_available: true,

    host_supported: true,

    // TODO(b/153609531): remove when no longer needed.

    native_bridge_supported: true,
@@ -75,6 +76,7 @@ cc_library { 
    vndk: {

        enabled: true,

    },

    recovery_available: true,

    double_loadable: true,

    host_supported: true,

    // TODO(b/153609531): remove when no longer needed.

libs/binder/Parcel.cpp

+2 −0
Original line number Diff line number Diff line
@@ -611,6 +611,8 @@ void Parcel::updateWorkSourceRequestHeaderPosition() const { 


#if defined(__ANDROID_VNDK__)

constexpr int32_t kHeader = B_PACK_CHARS('V', 'N', 'D', 'R');

#elif defined(__ANDROID_RECOVERY__)

constexpr int32_t kHeader = B_PACK_CHARS('R', 'E', 'C', 'O');

#else

constexpr int32_t kHeader = B_PACK_CHARS('S', 'Y', 'S', 'T');

#endif

libs/binder/ndk/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ cc_library { 


    defaults: ["libbinder_ndk_host_user"],

    host_supported: true,

    recovery_available: true,



    llndk: {

        symbol_file: "libbinder_ndk.map.txt",
@@ -155,6 +156,7 @@ cc_library_headers { 
    name: "libbinder_headers_platform_shared",

    export_include_dirs: ["include_cpp"],

    vendor_available: true,

    recovery_available: true,

    host_supported: true,

    // TODO(b/153609531): remove when no longer needed.

    native_bridge_supported: true,