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

Commit 4a763ae6 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11227258 from 649d91d7 to 24Q2-release 

Change-Id: I54d7b9f732434e6ff469f3857fee0602e6897968
parents c3cdb632 649d91d7

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ cc_binary { 
    ],



    shared_libs: [

        "android.hardware.health-V2-ndk", // from librecovery_utils

        "android.hardware.health-V3-ndk", // from librecovery_utils

        "android.hardware.boot-V1-ndk",

        "librecovery_ui",

    ],

minadbd/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ cc_binary { 
    ],



    shared_libs: [

        "android.hardware.health-V2-ndk", // from librecovery_utils

        "android.hardware.health-V3-ndk", // from librecovery_utils

        "libbase",

        "libcrypto",

    ],
@@ -129,7 +129,7 @@ cc_test { 
    ],



    static_libs: [

        "android.hardware.health-V2-ndk", // from librecovery_utils

        "android.hardware.health-V3-ndk", // from librecovery_utils

        "libminadbd_services",

        "libfusesideload",

        "librecovery_utils",

recovery_utils/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -75,11 +75,11 @@ cc_library_static { 


    shared_libs: [

        // The following cannot be placed in librecovery_utils_defaults,

        // because at the time of writing, android.hardware.health-V2-ndk.so

        // because at the time of writing, android.hardware.health-V3-ndk.so

        // is not installed to the system image yet. (It is installed

        // to the recovery ramdisk.) Hence, minadbd_test must link to it

        // statically.

        "android.hardware.health-V2-ndk",

        "android.hardware.health-V3-ndk",

    ],



    export_include_dirs: [

tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ cc_test { 


    static_libs: libapplypatch_static_libs + librecovery_static_libs + [

        "android.hardware.health-translate-ndk",

        "android.hardware.health-V2-ndk",

        "android.hardware.health-V3-ndk",

        "libhealthshim",

        "librecovery_ui",

        "libfusesideload",

updater_sample/tools/gen_update_config.py

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import os.path 
import sys

import zipfile



import ota_from_target_files  # pylint: disable=import-error

import ota_utils  # pylint: disable=import-error





class GenUpdateConfig(object):
@@ -100,7 +100,7 @@ class GenUpdateConfig(object): 
    def _get_property_files(package_zip):

        """Constructs the property-files list for A/B streaming metadata."""



        ab_ota = ota_from_target_files.AbOtaPropertyFiles()

        ab_ota = ota_utils.AbOtaPropertyFiles()

        property_str = ab_ota.GetPropertyFilesString(package_zip, False)

        property_files = []

        for file in property_str.split(','):