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

Commit 65d83b57 authored by Bob Badour's avatar Bob Badour Committed by Automerger Merge Worker
Browse files

Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" am: 2977e90c am:... 

Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" am: 2977e90c am: 02918ee9 am: 26a065ed am: 8ead2ed7

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1642960

Change-Id: I1ea03e0918ea7526b678a9c58370616bc04804e7
parents 7f7908a0 8ead2ed7

libstats/pull_lazy/Android.bp

+5 −1
Original line number Diff line number Diff line 
// Lazy loading version of libstatspull that can be used by code

// that is running before the statsd APEX is mounted and

// libstatspull.so is available.

package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



cc_library_static {

    name: "libstatspull_lazy",

    header_libs: [

libstats/socket_lazy/Android.bp

+5 −1
Original line number Diff line number Diff line 
// Lazy loading version of libstatssocket that can be used by code

// that is running before the statsd APEX is mounted and

// libstatssocket.so is available.

package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



cc_library_static {

    name: "libstatssocket_lazy",

    header_libs: [

trusty/utils/acvp/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



cc_binary {

    name: "trusty_acvp_modulewrapper",

    vendor: true,