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

Commit 1fb271f6 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Fixing some errorprone build rules 

Bug: 186259590
Test: Presubmit
Change-Id: I3a4a306a0351a67d53e35a6919296dbda8649766
parent 2c216332

Android.bp

+9 −7
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ package { 
    default_applicable_licenses: ["packages_apps_Launcher3_license"],

    default_applicable_licenses: ["packages_apps_Launcher3_license"],

}

}





min_launcher3_sdk_version = "26"



// Added automatically by a large-scale-change

// Added automatically by a large-scale-change

// See: http://go/android-license-faq

// See: http://go/android-license-faq

license {

license {
@@ -92,7 +94,7 @@ java_library { 
    srcs: ["src_plugins/**/*.java"],

    srcs: ["src_plugins/**/*.java"],





    sdk_version: "current",

    sdk_version: "current",

    min_sdk_version: "28",

    min_sdk_version: min_launcher3_sdk_version,

}

}





// Library with all the dependencies for building Launcher3

// Library with all the dependencies for building Launcher3
@@ -114,7 +116,7 @@ android_library { 
    ],

    ],

    manifest: "AndroidManifest-common.xml",

    manifest: "AndroidManifest-common.xml",

    sdk_version: "current",

    sdk_version: "current",

    min_sdk_version: "26",

    min_sdk_version: min_launcher3_sdk_version,

    lint: {

    lint: {

        baseline_filename: "lint-baseline-res-lib.xml",

        baseline_filename: "lint-baseline-res-lib.xml",

    },

    },
@@ -128,7 +130,7 @@ android_library { 
    srcs: ["src_build_config/**/*.java"],

    srcs: ["src_build_config/**/*.java"],

    static_libs: ["Launcher3ResLib"],

    static_libs: ["Launcher3ResLib"],

    sdk_version: "current",

    sdk_version: "current",

    min_sdk_version: "26",

    min_sdk_version: min_launcher3_sdk_version,

    manifest: "AndroidManifest-common.xml",

    manifest: "AndroidManifest-common.xml",

    lint: {

    lint: {

        baseline_filename: "lint-baseline-common-deps-lib.xml",

        baseline_filename: "lint-baseline-common-deps-lib.xml",
@@ -160,8 +162,8 @@ android_app { 
    },

    },





    sdk_version: "current",

    sdk_version: "current",

    min_sdk_version: "26",

    min_sdk_version: min_launcher3_sdk_version,

    target_sdk_version: "29",

    target_sdk_version: "current",

    privileged: true,

    privileged: true,

    system_ext_specific: true,

    system_ext_specific: true,
@@ -195,7 +197,7 @@ android_library { 
        "SystemUI-statsd",

        "SystemUI-statsd",

    ],

    ],

    manifest: "quickstep/AndroidManifest.xml",

    manifest: "quickstep/AndroidManifest.xml",

    min_sdk_version: "28",

    min_sdk_version: "current",

}

}
@@ -244,7 +246,7 @@ android_library { 
        "go/AndroidManifest.xml",

        "go/AndroidManifest.xml",

        "AndroidManifest-common.xml",

        "AndroidManifest-common.xml",

    ],

    ],

    min_sdk_version: "29",

    min_sdk_version: "current",

    lint: {

    lint: {

        baseline_filename: "lint-baseline-go-res-lib.xml",

        baseline_filename: "lint-baseline-go-res-lib.xml",

    },

    },