summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2021-02-21 00:08:33 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2021-02-21 00:08:33 +0000
commit683d87dbb03e281595e53dea6c7c02ca5f0a1a5d (patch)
treec7c97e98a83129d90f5a5329b4e83ab9f9f41143
parent54dc2de0bda2ba421f4033c4c6470016f41b1559 (diff)
parent83cb6ed2e4e860b20ae2d993b58df8b9f4ab1e82 (diff)
downloadGallery2-683d87dbb03e281595e53dea6c7c02ca5f0a1a5d.tar.gz
Snap for 7160059 from 83cb6ed2e4e860b20ae2d993b58df8b9f4ab1e82 to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release
Change-Id: I12f2f43bbcd40daa0af1d516084fb59481c20d88
-rw-r--r--Android.bp4
-rw-r--r--gallerycommon/Android.bp4
-rw-r--r--jni/Android.bp4
-rw-r--r--jni_jpegstream/Android.bp4
4 files changed, 16 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 0b0d4e6fd..03ab82bd2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,7 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
android_app {
name: "Gallery2",
diff --git a/gallerycommon/Android.bp b/gallerycommon/Android.bp
index 9ce3e9ff6..8d12f8895 100644
--- a/gallerycommon/Android.bp
+++ b/gallerycommon/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: "com.android.gallery3d.common2",
srcs: ["src/**/*.java"],
diff --git a/jni/Android.bp b/jni/Android.bp
index b066192bb..2fba236ee 100644
--- a/jni/Android.bp
+++ b/jni/Android.bp
@@ -1,3 +1,7 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
cc_defaults {
name: "gallery2_jni_defaults",
product_specific: true,
diff --git a/jni_jpegstream/Android.bp b/jni_jpegstream/Android.bp
index 780037a99..4a3766b6a 100644
--- a/jni_jpegstream/Android.bp
+++ b/jni_jpegstream/Android.bp
@@ -1,4 +1,8 @@
// Jpeg Streaming native
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
cc_library_shared {
name: "libjni_jpegstream",
product_specific: true,