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

Commit 8fcace44 authored by Paul Duffin's avatar Paul Duffin
Browse files

Replace no_framework_libs: true with sdk_version: "core_platform"

(cherry picked from commit 7954524e3cc618830f0bf7b23687bf222ecd285b)

Bug: 134566750
Test: m
Change-Id: I0260942108a13cc5e9bed1d6005abfb8daffe0ac
Exempt-From-Owner-Approval: minor build change
parent beec6d62
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ java_defaults {
        "core/java/android/content/pm/AndroidTestBaseUpdater.java",
    ],

    no_framework_libs: true,
    sdk_version: "core_platform",
    libs: [
        "ext",
        "updatable_media_stubs",
@@ -945,7 +945,7 @@ filegroup {
java_library {
    name: "ext",
    installable: true,
    no_framework_libs: true,
    sdk_version: "core_platform",
    static_libs: [
        "libphonenumber-platform",
        "nist-sip",
@@ -1169,7 +1169,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",
@@ -1704,7 +1704,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: [
+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"],
+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",
}
+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
+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",