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

Commit 41b58c6e authored by Bob Badour's avatar Bob Badour Committed by Android (Google) Code Review
Browse files

Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3" into sc-dev

parents 682af236 390b27e4

quickstep/Android.bp

+9 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,15 @@ 
// See the License for the specific language governing permissions and

// See the License for the specific language governing permissions and

// limitations under the License.

// limitations under the License.





package {

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

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "packages_apps_Launcher3_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["packages_apps_Launcher3_license"],

}



filegroup {

filegroup {

    name: "launcher3-quickstep-robolectric-src",

    name: "launcher3-quickstep-robolectric-src",

    path: "robolectric_tests",

    path: "robolectric_tests",

robolectric_tests/Android.bp

+9 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,15 @@ 
// Launcher Robolectric test target.

// Launcher Robolectric test target.

//

//

//        "robolectric_android-all-stub", not needed, we write our own stubs

//        "robolectric_android-all-stub", not needed, we write our own stubs

package {

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

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "packages_apps_Launcher3_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["packages_apps_Launcher3_license"],

}



filegroup {

filegroup {

    name: "launcher3-robolectric-resources",

    name: "launcher3-robolectric-resources",

    path: "resources",

    path: "resources",
@@ -47,4 +56,3 @@ android_robolectric_test { 
        timeout: 36000,

        timeout: 36000,

    },

    },

}
 
}

tests/Android.bp

+9 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,15 @@ 
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// See the License for the specific language governing permissions and

// limitations under the License.

// limitations under the License.

package {

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

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "packages_apps_Launcher3_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["packages_apps_Launcher3_license"],

}



filegroup {

filegroup {

    name: "launcher3-test-src-common",

    name: "launcher3-test-src-common",

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

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