resolve merge conflicts of 78c16f711d6c416e1f7c9fc11584d5da7f507745 to sc-dev
Change-Id: I07a3255527dfd29a91ef80dbda8ee4deed1f512d
diff --git a/Android.bp b/Android.bp
index 600f67b..08e3b73 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,23 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["packages_modules_ExtServices_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+ name: "packages_modules_ExtServices_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ ],
+ license_text: [
+ "NOTICE",
+ ],
+}
+
android_library {
name: "ExtServices-core",
srcs: [
diff --git a/apex/Android.bp b/apex/Android.bp
index 656812a..db460cb 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -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 "packages_modules_ExtServices_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["packages_modules_ExtServices_license"],
+}
+
apex {
name: "com.android.extservices",
defaults: ["com.android.extservices-defaults"],
diff --git a/apex/testing/Android.bp b/apex/testing/Android.bp
index 88a4724..3dbc5fb 100644
--- a/apex/testing/Android.bp
+++ b/apex/testing/Android.bp
@@ -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 "packages_modules_ExtServices_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["packages_modules_ExtServices_license"],
+}
+
apex_test {
name: "test_com.android.extservices",
visibility: [