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

Commit 6072de17 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6680390 from add3b3a1 to rvc-release 

Change-Id: I8b05f49b34f8d9f028ac41ee5b6cedf14a64ba76
parents 2238fcaf add3b3a1

libbacktrace/Android.bp

+5 −0
Original line number Original line Diff line number Diff line
@@ -96,6 +96,8 @@ cc_defaults { 
cc_library {

cc_library {

    name: "libbacktrace",

    name: "libbacktrace",

    vendor_available: false,

    vendor_available: false,

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

    native_bridge_supported: true,

    recovery_available: true,

    recovery_available: true,

    apex_available: [

    apex_available: [

        "//apex_available:platform",

        "//apex_available:platform",
@@ -120,6 +122,9 @@ cc_library { 
        recovery: {

        recovery: {

            cflags: ["-DNO_LIBDEXFILE_SUPPORT"],

            cflags: ["-DNO_LIBDEXFILE_SUPPORT"],

        },

        },

        native_bridge: {

            cflags: ["-DNO_LIBDEXFILE_SUPPORT"],

        },

    },

    },

}

}

libprocinfo/Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,8 @@ cc_library { 
    name: "libprocinfo",

    name: "libprocinfo",

    defaults: ["libprocinfo_defaults"],

    defaults: ["libprocinfo_defaults"],

    vendor_available: true,

    vendor_available: true,

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

    native_bridge_supported: true,

    recovery_available: true,

    recovery_available: true,

    vndk: {

    vndk: {

        enabled: true,

        enabled: true,

libunwindstack/Android.bp

+7 −0
Original line number Original line Diff line number Diff line
@@ -113,6 +113,8 @@ cc_library { 
    name: "libunwindstack",

    name: "libunwindstack",

    vendor_available: true,

    vendor_available: true,

    recovery_available: true,

    recovery_available: true,

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

    native_bridge_supported: true,

    vndk: {

    vndk: {

        enabled: true,

        enabled: true,

        support_system_process: true,

        support_system_process: true,
@@ -134,6 +136,11 @@ cc_library { 
            exclude_srcs: ["DexFile.cpp"],

            exclude_srcs: ["DexFile.cpp"],

            exclude_shared_libs: ["libdexfile_support"],

            exclude_shared_libs: ["libdexfile_support"],

        },

        },

        native_bridge: {

            cflags: ["-UDEXFILE_SUPPORT"],

            exclude_srcs: ["DexFile.cpp"],

            exclude_shared_libs: ["libdexfile_support"],

        },

    },

    },





    apex_available: [

    apex_available: [

libutils/Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -175,6 +175,8 @@ cc_library { 
cc_library {

cc_library {

    name: "libutilscallstack",

    name: "libutilscallstack",

    defaults: ["libutils_defaults"],

    defaults: ["libutils_defaults"],

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

    native_bridge_supported: true,





    srcs: [

    srcs: [

        "CallStack.cpp",

        "CallStack.cpp",

libutils/String16.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -454,7 +454,7 @@ status_t String16::remove(size_t len, size_t begin) 
        mString = getEmptyString();

        mString = getEmptyString();

        return OK;

        return OK;

    }

    }

    if ((begin+len) > N) len = N-begin;

    if (len > N || len > N - begin) len = N - begin;

    if (begin == 0 && len == N) {

    if (begin == 0 && len == N) {

        return OK;

        return OK;

    }

    }