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

Commit fc85dca1 authored by Paul Duffin's avatar Paul Duffin Committed by android-build-merger
Browse files

Merge "Replace no_framework_libs: true with sdk_version: "core_platform"" into... 

Merge "Replace no_framework_libs: true with sdk_version: "core_platform"" into qt-dev-plus-aosp am: 23b3ebfd
am: 4575c696

Change-Id: I01c64024c8d59a607a2a8c6d41aec852b41d4445
parents 5f84625a 4575c696

Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ java_defaults { 
        "core/java/android/content/pm/AndroidTestBaseUpdater.java",

    ],



    no_framework_libs: true,

    sdk_version: "core_platform",

    libs: [

        "ext",

        "updatable_media_stubs",
@@ -951,7 +951,7 @@ filegroup { 
java_library {

    name: "ext",

    installable: true,

    no_framework_libs: true,

    sdk_version: "core_platform",

    static_libs: [

        "libphonenumber-platform",

        "nist-sip",
@@ -1175,7 +1175,7 @@ optional_subdirs = [ 
// updated to use hwbinder.stubs.

java_library {

    name: "hwbinder",

    no_framework_libs: true,

    sdk_version: "core_platform",



    srcs: [

        "core/java/android/os/HidlSupport.java",
@@ -1702,7 +1702,7 @@ droidstubs { 
        "core/java/android/util/AndroidException.java",

    ],

    installable: false,

    no_framework_libs: true,

    sdk_version: "core_platform",

    annotations_enabled: true,

    previous_api: ":last-released-public-api",

    merge_annotations_dirs: [

cmds/statsd/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ cc_benchmark { 
// ====  java proto device library (for test only)  ==============================

java_library {

    name: "statsdprotolite",

    no_framework_libs: true,

    sdk_version: "core_platform",

    proto: {

        type: "lite",

        include_dirs: ["external/protobuf/src"],

core/proto/android/stats/devicepolicy/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -29,5 +29,5 @@ java_library_static { 
            static_libs: ["libprotobuf-java-nano"],

        }

    },

    no_framework_libs: true,

    sdk_version: "core_platform",

}

core/res/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


android_app {

    name: "framework-res",

    no_framework_libs: true,

    sdk_version: "core_platform",

    certificate: "platform",



    // Soong special-cases framework-res to install this alongside

media/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ java_library { 
    installable: true,



    // Make sure that the implementaion only relies on SDK or system APIs.

    no_framework_libs: true,

    sdk_version: "core_platform",

    libs: [

        // The order matters. android_system_* library should come later.

        "framework_media_annotation",