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

Commit 09bb3011 authored by Bob Badour's avatar Bob Badour Committed by Automerger Merge Worker
Browse files

Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into sc-dev am: 745e7ee8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13670655

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f4106acdb1594a0bcee65c9689fce32eaa65628
parents 9eaa39c4 745e7ee8

apct-tests/perftests/contentcapture/Android.bp

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

// 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 "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



android_test {

    name: "ContentCapturePerfTests",

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

apct-tests/perftests/inputmethod/Android.bp

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

// 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 "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



android_test {

    name: "ImePerfTests",

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

apex/appsearch/Android.bp

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

// 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 "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



apex {

    name: "com.android.appsearch",

    manifest: "apex_manifest.json",

apex/appsearch/framework/Android.bp

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

// 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 "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



filegroup {

    name: "framework-appsearch-sources",

    srcs: [

apex/appsearch/service/Android.bp

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

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

// 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 "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



java_library {

    name: "service-appsearch",

    installable: true,