diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-20 17:23:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-20 17:23:09 +0000 |
| commit | 81ba12c3cc8c7c9efb0e10e848f77443e32b2502 (patch) | |
| tree | c7c97e98a83129d90f5a5329b4e83ab9f9f41143 | |
| parent | 05359f9c9994770b524086a476fcb953e1a3cc02 (diff) | |
| parent | ccdc9380a5902b6f739ace8fd2db6fea5b195763 (diff) | |
| download | Gallery2-81ba12c3cc8c7c9efb0e10e848f77443e32b2502.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Gallery2" am: 2b69347686 am: 012ae6941d am: ccdc9380a5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1588381
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f96f243d4e86f3a09f6825a1d76ecf00c886688
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | gallerycommon/Android.bp | 4 | ||||
| -rw-r--r-- | jni/Android.bp | 4 | ||||
| -rw-r--r-- | jni_jpegstream/Android.bp | 4 |
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, |