diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-03 17:31:46 -0800 |
|---|---|---|
| committer | Bob Badour <bbadour@google.com> | 2021-02-05 01:24:58 -0800 |
| commit | 791c056dc2c2f53b110753a902cb1a26599c7126 (patch) | |
| tree | 9df88c82f3605fdcacc6fc47b566743dd10dac74 /amber/camera | |
| parent | 99e332d008585d705b925ebc5b64aef078499233 (diff) | |
| download | easel-791c056dc2c2f53b110753a902cb1a26599c7126.tar.gz | |
[LSC] Add LOCAL_LICENSE_KINDS to hardware/google/easelandroid-s-preview-1
Added SPDX-license-identifier-Apache-2.0 to:
Android.bp
amber/camera/Android.bp
amber/camera/libhdrplusclient/Android.mk
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: I16a5e68b3d379fed343a8cc20e67c3ac4aabb48b
Diffstat (limited to 'amber/camera')
| -rw-r--r-- | amber/camera/Android.bp | 8 | ||||
| -rw-r--r-- | amber/camera/libhdrplusclient/Android.mk | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/amber/camera/Android.bp b/amber/camera/Android.bp index d0d2dad..c72e035 100644 --- a/amber/camera/Android.bp +++ b/amber/camera/Android.bp @@ -14,6 +14,14 @@ * limitations under the License. */ +package { + // http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // the below license kinds from "hardware_google_easel_license": + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["hardware_google_easel_license"], +} + cc_library_headers { name: "libhdrplusclient_headers", proprietary: true, diff --git a/amber/camera/libhdrplusclient/Android.mk b/amber/camera/libhdrplusclient/Android.mk index e898824..5e89389 100644 --- a/amber/camera/libhdrplusclient/Android.mk +++ b/amber/camera/libhdrplusclient/Android.mk @@ -54,6 +54,8 @@ LOCAL_EXPORT_C_INCLUDE_DIRS += \ hardware/google/easel/amber/camera/include LOCAL_MODULE:= libhdrplusclient +LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS:= notice LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_OWNER := google |