summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I2c2a81b364f8b636fd02db7923951c4da73731fd Change-Id: I902548e770b4e3ed9bdc4ef12460f30bdcb346d9
2021-02-08Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: 77f068fc5aElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1579488 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1fda713b3e409263c3927bdb79c530052e9d86da
2021-02-08Merge remote-tracking branch 'aosp/upstream-master' into mymergeandroid-s-preview-1Elliott Hughes
Also fix METADATA to point to upstream so this project stays up to date. Bug: http://b/179674268 Test: treehugger Change-Id: I0a644fbb3688daec2565daa5d2cf530e15b68f9f
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/ukey2 am: 2662d7a9f9Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1575972 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id55a38435c40539deb8ed4aa3948149f43f9c85b
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/ukey2Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Idb9680f9037d6f99c780edc9ae9639391eb8d8da
2020-11-25Mark ab/6881855 as merged am: f19a71e27cXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ukey2/+/13109973 Change-Id: I2c2a81b364f8b636fd02db7923951c4da73731fd
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ia79df205ec3c568f3863f4273fb937d047677fbf
2020-11-10Update ukey2 am: 1182deea1e am: be53c6d491 am: 5b7b1e9c88Erin Yan
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1484639 Change-Id: I6815cdf3ee57071719925273b89affc1cc82e8b0
2020-11-10Update ukey2 am: 1182deea1e am: be53c6d491Erin Yan
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1484639 Change-Id: I09f33b68004442fa4f3f628356b6fa36e8db18cd
2020-11-10Update ukey2 am: 1182deea1eErin Yan
Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/1484639 Change-Id: Idddc0d0da99800fd4c1d074f8da11ef25eaab553
2020-11-09Update ukey2Erin Yan
This update is being pulled in from github https://github.com/google/ukey2 This update only includes java lib Bug: 172576615 Test: Build Change-Id: I7ee4375b7ed3c3908ec6672f529a88aa6080efb9
2020-07-06Merge pull request #6 from apolyudov/masterAlexei Czeskis
Roll forward to cl/319125760
2020-06-30Roll forward to cl/319125760Alexey Polyudov
Signed-off-by: Alexey Polyudov <apolyudov@google.com> Change-Id: I948aa562e910c896aa7803c0ba275e8efa95804c
2020-06-22Merge pull request #4 from apolyudov/masterAlexei Czeskis
Bring ukey2 up-to-date with internal code
2020-06-22Switch securemessage submodule project to google/Alexey Polyudov
clean up gradle artifacts. add c++ test helper app. Signed-off-by: Alexey Polyudov <apolyudov@google.com> Change-Id: I96cde0abe95a3a2995df23e0661058e4e650ae87
2020-06-22Bring ukey2 up-to-date with internal codeAlexey Polyudov
Signed-off-by: Alexey Polyudov <apolyudov@google.com> Change-Id: Ie087ddaeef2c38f413484145114da7835c19f69b
2020-06-22Merge pull request #5 from apolyudov/javaAlexei Czeskis
Refresh Java code and proto files, add Java tests and enable standalo…
2020-06-22Refresh Java code and proto files, add Java tests and enable standalone java ↵Alexey Polyudov
build Signed-off-by: Alexey Polyudov <apolyudov@google.com> Change-Id: Ic9f597ec66c57d468a5d90b4c0e05d430f4961db
2020-04-24Add license type: Apache2 is a NOTICE license am: 36df4013c8 am: 85debd146d ↵Bob Badour
am: 9a70ed2e2e am: d0f5ee5f74 Change-Id: I4eb5187449e87ccb3106043b42fa82e0b760830c
2020-04-24Add license type: Apache2 is a NOTICE license am: 36df4013c8 am: 85debd146d ↵Bob Badour
am: 9a70ed2e2e Change-Id: Ic588882bf5462dd3eca96f6f16a97281e559fd32
2020-04-24Add license type: Apache2 is a NOTICE license am: 36df4013c8 am: 85debd146dBob Badour
Change-Id: I80f42435076ac7f1b850cd478fc90becee734fa5
2020-04-24Add license type: Apache2 is a NOTICE license am: 36df4013c8android-r-beta-3android-r-beta-2Bob Badour
Change-Id: Ib511caaa627b45578f69d5fd59aa98da3af3586f
2020-04-23Add license type: Apache2 is a NOTICE licenseBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Id2a1aa4c050433cbbe3cf97b99a40a26bcb3978f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: acb7542149 -s ours am: 05c0545f9e am: 54ac245fd1 Change-Id: Ida477d3b5c48d622f4e8ae69e5b916d9ea046a05
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: acb7542149 -s ours am: 05c0545f9e Change-Id: Ia2177675d5fdd2000ef849ffab306d56fc659beb
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: acb7542149 -s ours am skip reason: subject contains skip directive Change-Id: I2aedff9d036143930c0137c1d509e88f521aced4
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I1328eca7fc69a6d31312912284b01f51f952d6e7
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4120bbebf6 am: ↵Treehugger Robot
fb602f0c39 am: 4ef7ef48d2 am: 50be8d0faa Change-Id: I2047edea66f8f73628e9dda69522fb9103bf9a21
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4120bbebf6 am: ↵Treehugger Robot
fb602f0c39 am: 4ef7ef48d2 Change-Id: If52b7b4a7e94e03a3769c5be2b214f2ecc04966f
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4120bbebf6 am: ↵Treehugger Robot
fb602f0c39 Change-Id: Ib6ef5a4f55a58491dd38d45b3db7b2a51e7883eb
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4120bbebf6 am: ↵Treehugger Robot
fb602f0c39 Change-Id: I3f23eddce2d14fdfb4e20d7ee6e8566e069466da
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: 4120bbebf6Treehugger Robot
Change-Id: If8fa2ce1a0d95a3b69362087a557ae10576b3fb5
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE."Treehugger Robot
2020-03-26Remove redundant NOTICE symbolic link. am: daa0a5190e am: c021c231a8 am: ↵Bob Badour
b1da275abc am: 888e08fa48 Change-Id: Icecf9aea377fd6c7b63ff19f31c9156c2a68a5b4
2020-03-26Remove redundant NOTICE symbolic link. am: daa0a5190e am: c021c231a8 am: ↵Bob Badour
b1da275abc Change-Id: I6efb0bca0b62e8d79f3de6ed0106ccb4b141c4f8
2020-03-26Remove redundant NOTICE symbolic link. am: daa0a5190e am: c021c231a8Bob Badour
Change-Id: Ic7cd1aafe409b49ac952fa7de61de3059d4678d4
2020-03-26Remove redundant NOTICE symbolic link. am: daa0a5190e am: c021c231a8Bob Badour
Change-Id: Icdd7c4b8d0cffc125223d2cfa4fc5eca665d2769
2020-03-26Remove redundant NOTICE symbolic link. am: daa0a5190eBob Badour
Change-Id: I170b415703da24bc0e26250414b54be323cd34af
2020-03-25Remove redundant NOTICE copied from LICENSE.Bob Badour
Identified using the below shell script: $ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \ | while read dir; do \ if [ -f "${dir}/NOTICE" ] \ && diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \ echo "${dir}/NOTICE"; \ fi; \ done Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are merged, LICENSE files copied into NOTICE files are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: I54fe25e12cfe0b542263f5078405d0e93b19302b
2020-03-25Remove redundant NOTICE symbolic link.Bob Badour
Now that http://aosp/1235427 and http://aosp/1238719 are in, NOTICE symbolic links are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: If842353fc1a6b3c57b54688bdb908207a59cec02
2019-04-03Adding Android.bp to build the ukey2 library. am: fbc3036c1a am: ad6aa9185dr_aml_301500702q_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-12.0.0_r55android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseRam Periathiruvadi
am: 93be73bce7 Change-Id: Iadbc66eb79c740dd235febb3bbd97f55fc7538c4
2019-04-03Adding Android.bp to build the ukey2 library. am: fbc3036c1aRam Periathiruvadi
am: ad6aa9185d Change-Id: I81861d322ae356222d9cd9aeff398907052eeabd
2019-04-03Adding Android.bp to build the ukey2 library.Ram Periathiruvadi
am: fbc3036c1a Change-Id: I3d35f566649a55e1a22d1530d6fada69697cf6dc
2019-04-03Adding Android.bp to build the ukey2 library.android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5Ram Periathiruvadi
Merging from upstream-master. Bug: 128414151 Test: Build the library. Change-Id: I40c32e06935ad8a012b8dc7103111648d95ec771
2019-04-02Fix the proto import path in Android build file. (#3)Ram Periathiruvadi
This library gets mirrored onto AOSP in platform/external/ukey2. Fixing the proto import paths in the Android.bp file so building for AOSP targets can be successful.
2019-03-11Merge pull request #2 from google/buildRam Periathiruvadi
Add android build file
2019-02-13Merge branch 'upstream-master' am: 41158505f5 am: 661b17d2d2Ram Periathiruvadi
am: 7f0edc130f Change-Id: Iaaa4dad2af1cdf1ab05c1efb228448983799238c
2019-02-13Merge branch 'upstream-master' am: 41158505f5Ram Periathiruvadi
am: 661b17d2d2 Change-Id: I3eeed01b8b94cacede6345a9072160823a040257
2019-02-13Merge branch 'upstream-master'Ram Periathiruvadi
am: 41158505f5 Change-Id: I676bd7cad7d847a28214c0af3e7d9d170f1f0156
2019-02-13Merge branch 'upstream-master'android-q-preview-1Ram Periathiruvadi
Bug: b/124378762
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 05:33:00 +0000