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

Commit ff32698f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents e7418497 56a34d9f

Android.bp

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

    ],



    no_framework_libs: true,

    sdk_version: "core_platform",

    libs: [

        "ext",

    ],
@@ -865,7 +865,7 @@ filegroup { 
java_library {

    name: "ext",

    installable: true,

    no_framework_libs: true,

    sdk_version: "core_platform",

    static_libs: [

        "libphonenumber-platform",

        "nist-sip",
@@ -1024,7 +1024,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",
@@ -1557,7 +1557,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
@@ -301,7 +301,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/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

proto/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ java_library_static { 
        type: "nano",

    },

    srcs: ["src/**/*.proto"],

    no_framework_libs: true,

    sdk_version: "core_platform",

    // Pin java_version until jarjar is certified to support later versions. http://b/72703434

    java_version: "1.8",

    target: {