Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/ex"android-s-preview-1

10 files changed, 40 insertions, 0 deletions

diff --git a/camera2/portability/Android.bp b/camera2/portability/Android.bp
index fa7bc056..10d24fc7 100644
--- a/camera2/portability/Android.bp
+++ b/camera2/portability/Android.bp
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 java_library {
     name: "android-ex-camera2-portability",
     sdk_version: "current",
diff --git a/camera2/portability/tests/Android.bp b/camera2/portability/tests/Android.bp
index 09ccd899..d81c9bc7 100644
--- a/camera2/portability/tests/Android.bp
+++ b/camera2/portability/tests/Android.bp
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "android-ex-camera2-portability-tests",
     sdk_version: "current",
diff --git a/camera2/public/Android.bp b/camera2/public/Android.bp
index 80d723b2..0ede9c4b 100644
--- a/camera2/public/Android.bp
+++ b/camera2/public/Android.bp
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 java_library {
     name: "android-ex-camera2",
     sdk_version: "current",
diff --git a/camera2/utils/Android.bp b/camera2/utils/Android.bp
index 85ef75c6..8dc4cd30 100644
--- a/camera2/utils/Android.bp
+++ b/camera2/utils/Android.bp
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 java_library {
     name: "android-ex-camera2-utils",
     sdk_version: "current",
diff --git a/camera2/utils/tests/Android.bp b/camera2/utils/tests/Android.bp
index 6be7f390..1ef9d05e 100644
--- a/camera2/utils/tests/Android.bp
+++ b/camera2/utils/tests/Android.bp
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "android-ex-camera2-utils-tests",
     sdk_version: "current",
diff --git a/common/Android.bp b/common/Android.bp
index e37d3b85..16cc7fd5 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -15,6 +15,10 @@
 // Note: the source code is in java/, not src/, because this code is also part of
 // the framework library, and build/core/pathmap.mk expects a java/ subdirectory.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 java_library_static {
     name: "android-common",
     sdk_version: "8",
diff --git a/common/tests/Android.bp b/common/tests/Android.bp
index d4d8eb32..b54c8998 100644
--- a/common/tests/Android.bp
+++ b/common/tests/Android.bp
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "AndroidCommonTests",
     certificate: "platform",
diff --git a/framesequence/Android.bp b/framesequence/Android.bp
index c3aa9ef5..9a6d0f55 100644
--- a/framesequence/Android.bp
+++ b/framesequence/Android.bp
@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 java_library {
     name: "android-common-framesequence",
     sdk_version: "8",
diff --git a/framesequence/jni/Android.bp b/framesequence/jni/Android.bp
index 4d687188..13ae47af 100644
--- a/framesequence/jni/Android.bp
+++ b/framesequence/jni/Android.bp
@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 cc_library_shared {
     name: "libframesequence",
 
diff --git a/framesequence/samples/FrameSequenceSamples/Android.bp b/framesequence/samples/FrameSequenceSamples/Android.bp
index 24458dfa..f6bd93f0 100644
--- a/framesequence/samples/FrameSequenceSamples/Android.bp
+++ b/framesequence/samples/FrameSequenceSamples/Android.bp
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
 
     name: "FrameSequenceSample",