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

Commit 1befb63d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7302914 from 35587e8e to sc-release 

Change-Id: I4c97deffbbb599837408c42832e40b5fc2987cdc
parents f8309015 35587e8e

tests/Android.bp

+3 −1
Original line number Original line Diff line number Diff line
@@ -148,9 +148,11 @@ cc_test { 
        "libupdater_core",

        "libupdater_core",

        "libupdate_verifier",

        "libupdate_verifier",





        "libgtest_prod",

        "libprotobuf-cpp-lite",

        "libprotobuf-cpp-lite",

    ],

    ],

    header_libs: [

        "libgtest_prod_headers",

    ],





    data: [

    data: [

        "testdata/*",

        "testdata/*",

updater/Android.bp

+3 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ cc_defaults { 
        "libfec_rs",

        "libfec_rs",

        "libavb",

        "libavb",

        "libverity_tree",

        "libverity_tree",

        "libgtest_prod",

        "liblog",

        "liblog",

        "liblp",

        "liblp",

        "libselinux",

        "libselinux",
@@ -51,6 +50,9 @@ cc_defaults { 
        "libcutils",

        "libcutils",

        "libutils",

        "libutils",

    ],

    ],

    header_libs: [

        "libgtest_prod_headers",

    ],

}

}





cc_defaults {

cc_defaults {

updater/Android.mk

+2 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,6 @@ updater_common_static_libraries := \ 
    libfec_rs \

    libfec_rs \

    libavb \

    libavb \

    libverity_tree \

    libverity_tree \

    libgtest_prod \

    liblog \

    liblog \

    liblp \

    liblp \

    libselinux \

    libselinux \
@@ -96,6 +95,8 @@ LOCAL_STATIC_LIBRARIES := \ 
    libtune2fs \

    libtune2fs \

    $(tune2fs_static_libraries)

    $(tune2fs_static_libraries)





LOCAL_HEADER_LIBRARIES := libgtest_prod_headers



LOCAL_MODULE_CLASS := EXECUTABLES

LOCAL_MODULE_CLASS := EXECUTABLES

inc := $(call local-generated-sources-dir)/register.inc

inc := $(call local-generated-sources-dir)/register.inc