diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:05:24 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:05:24 +0000 |
commit | c90ba560c78829ffd9cf1d0e6e3c2998cdea040b (patch) | |
tree | d89c870f8282050a184590314faef3c890b61394 | |
parent | 068aa473eab7cc0521c1b01668fdadb98b5e11f1 (diff) | |
parent | 6079cbb5196e1e026edc793e7e61240afb4c2bf3 (diff) | |
download | easel-c90ba560c78829ffd9cf1d0e6e3c2998cdea040b.tar.gz |
Snap for 8564071 from 6079cbb5196e1e026edc793e7e61240afb4c2bf3 to mainline-permission-releaseaml_per_341614000aml_per_341510010aml_per_341410020aml_per_341311000aml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010aml_per_331913010aml_per_331812030aml_per_331710050aml_per_331611010aml_per_331512020aml_per_331411000aml_per_331313010aml_per_331115020aml_per_331019040aml_per_330912010aml_per_330811030android14-mainline-permission-releaseandroid13-mainline-permission-release
Change-Id: Id0c6ea209f9cc3ab14ac00f5dfafe4955bad572e
-rw-r--r-- | METADATA | 3 | ||||
-rw-r--r-- | amber/camera/Android.bp | 5 | ||||
-rw-r--r-- | amber/camera/libhdrplusclient/Android.mk | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/METADATA b/METADATA new file mode 100644 index 0000000..d97975c --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} diff --git a/amber/camera/Android.bp b/amber/camera/Android.bp index d0d2dad..53de249 100644 --- a/amber/camera/Android.bp +++ b/amber/camera/Android.bp @@ -14,6 +14,11 @@ * limitations under the License. */ +package { + // http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], +} + 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 |