summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-05-06msm8974: remove from top level makefile am: 583ecf5ed2 am: 543927ba34Patrick Tjin
am: 2009f5074d * commit '2009f5074dbab5f1969c96cd9815b7133892b7c6': msm8974: remove from top level makefile Change-Id: I95766e2c84ee7080aa056265a1fad4eb863f266c
2016-05-06Merge "msm8974: remove from top level makefile am: 583ecf5ed2 am: ↵android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1android-n-iot-preview-4o-previewn-iot-preview-4Android Build Merger (Role)
4e3df672cb" into nyc-mr1-dev-plus-aosp
2016-05-06msm8974: remove from top level makefile am: 583ecf5ed2Patrick Tjin
am: 4e3df672cb * commit '4e3df672cb47494a05434fa03793f3bb268f23b4': msm8974: remove from top level makefile Change-Id: Ic672475bd10d3f9cc5a1839aa80a7572bb94f454
2016-05-06msm8974: remove from top level makefile am: 583ecf5ed2Patrick Tjin
am: 543927ba34 * commit '543927ba34c345d5c70a79613145f671a23b69b1': msm8974: remove from top level makefile Change-Id: I9210a59fc01f34e14eb32c6d44a603e1e2c26abd
2016-05-06msm8974: remove from top level makefileandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-releasePatrick Tjin
am: 583ecf5ed2 * commit '583ecf5ed2a4be0d05229b8c6726680c3836be8b': msm8974: remove from top level makefile Change-Id: I68d0f4872bea0d5f64272850ac0bb4ac40362ee1
2016-05-06msm8974: remove from top level makefileandroid-n-mr1-preview-2android-n-mr1-preview-1Patrick Tjin
am: 583ecf5ed2 * commit '583ecf5ed2a4be0d05229b8c6726680c3836be8b': msm8974: remove from top level makefile Change-Id: I0a58e23a3a941f16cdc8a4efc48b6a559917d1d3
2016-05-06msm8974: remove from top level makefileandroid-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-devnougat-cts-releasenougat-bugfix-releasePatrick Tjin
Bug: 27656253 Change-Id: I0cdd97c59246eedfbccaa5fbff2fe7065c930f6a
2015-09-16Remove legacy keymaster support for msm8226android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-iot-preview-2android-6.0.1_r68android-6.0.1_r67android-6.0.1_r62android-6.0.1_r54android-6.0.1_r53android-6.0.1_r45android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21nougat-mr1-wear-releasen-iot-preview-2marshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devUday Kishore Pasupuleti
Change-Id: I733a6b15d1b9c2cb163a6f65eb3fe64e3fced516 Signed-off-by: Uday Kishore Pasupuleti <upasupul@codeaurora.org>
2015-03-25am 56d7d4bc: am d2bdc571: Merge "Remove superfluous OpenSSL include paths."android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseKenny Root
* commit '56d7d4bc5fedf324f63727480a7f54809a445638': Remove superfluous OpenSSL include paths.
2015-03-25am d2bdc571: Merge "Remove superfluous OpenSSL include paths."Kenny Root
* commit 'd2bdc5718c2f1b64a740a0601a544241f503e1f0': Remove superfluous OpenSSL include paths.
2015-03-25Merge "Remove superfluous OpenSSL include paths."android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewmaster-soongKenny Root
2015-02-26am fb378aec: am 26391c90: Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden
* commit 'fb378aecff0b635f72614e5b0f8cca36271051d1': Separate keymaster0 and keymaster1 HALs.
2015-02-26am 26391c90: Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden
* commit '26391c901ef37d80ee5fa4ea3ef68d777df53c35': Separate keymaster0 and keymaster1 HALs.
2015-02-26Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden
2015-02-26am b00de244: Separate keymaster0 and keymaster1 HALs.Shawn Willden
* commit 'b00de24410696c4b10af0d96d64a5331393998ad': Separate keymaster0 and keymaster1 HALs.
2015-02-25Separate keymaster0 and keymaster1 HALs.Shawn Willden
Change-Id: I5c54282c12d1c4b8b22ed4929b6e6c724a94ede4
2015-02-25Separate keymaster0 and keymaster1 HALs.Shawn Willden
Change-Id: I5c54282c12d1c4b8b22ed4929b6e6c724a94ede4
2015-02-24Separate keymaster0 and keymaster1 HALs.Shawn Willden
Change-Id: I5c54282c12d1c4b8b22ed4929b6e6c724a94ede4
2015-01-22Remove superfluous OpenSSL include paths.Adam Langley
The libcrypto and libssl modules (and their respective static and host versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module is sufficient. Change-Id: Ia1a4e346932842128d88971e72552528cdb6fb33
2014-06-06am 2d8aa1e3: merge in master-release history after reset to ↵android-wear-5.0.0_r1android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseThe Android Automerger
f4191b59196237680f3ebc8fc2af62b36d9c25f9 * commit '2d8aa1e31fda7fd88c1b2d99c976832dd5374490': Set correct module version for qcom keystore
2014-06-04keymaster: fix QSEEComAPI lookup pathMekala Natarajan
Drop absolute path from libQSEEComAPI dlopen. Change-Id: I285b7fa4766bf5350dac69c1f530e9caae3bd844
2014-06-03keymaster: Build keymaster for msm8084Naveen Ramaraj
Also update the hal to work with ION changes Change-Id: I0c5abfa109119966c82a5d9cc025610cd89f9fd0
2014-05-22merge in master-release history after reset to ↵The Android Automerger
f4191b59196237680f3ebc8fc2af62b36d9c25f9
2014-05-22merge in master-release history after reset to ↵The Android Automerger
f4191b59196237680f3ebc8fc2af62b36d9c25f9
2014-05-21merge in master-release history after reset to ↵The Android Automerger
f4191b59196237680f3ebc8fc2af62b36d9c25f9
2014-05-20merge in master-release history after reset to ↵The Android Automerger
f4191b59196237680f3ebc8fc2af62b36d9c25f9
2014-05-19merge in master-release history after reset to ↵The Android Automerger
f4191b59196237680f3ebc8fc2af62b36d9c25f9
2014-05-18merge in master-release history after reset to ↵The Android Automerger
f4191b59196237680f3ebc8fc2af62b36d9c25f9
2014-05-17merge in master-release history after reset to ↵The Android Automerger
f4191b59196237680f3ebc8fc2af62b36d9c25f9
2014-05-15merge in master-release history after reset to ↵The Android Automerger
f4191b59196237680f3ebc8fc2af62b36d9c25f9
2014-05-14merge in master-release history after reset to ↵The Android Automerger
f4191b59196237680f3ebc8fc2af62b36d9c25f9
2014-05-13merge in master-release history after reset to ↵The Android Automerger
f4191b59196237680f3ebc8fc2af62b36d9c25f9
2014-05-12merge in master-release history after reset to ↵The Android Automerger
f4191b59196237680f3ebc8fc2af62b36d9c25f9
2014-05-11merge in master-release history after reset to ↵The Android Automerger
f4191b59196237680f3ebc8fc2af62b36d9c25f9
2014-05-10merge in master-release history after reset to ↵The Android Automerger
f4191b59196237680f3ebc8fc2af62b36d9c25f9
2014-05-08merge in master-release history after reset to ↵The Android Automerger
f4191b59196237680f3ebc8fc2af62b36d9c25f9
2014-05-07Set correct module version for qcom keystorePaul Lawrence
Requires https://android-review.googlesource.com/#/c/93571/ Bug: 14384714 Change-Id: I1544b9b2d4d069dbcfb8be219a1d9755c54342e6
2014-05-06Set correct module version for qcom keystorePaul Lawrence
Requires https://android-review.googlesource.com/#/c/93571/ Bug: 14384714 Change-Id: I1544b9b2d4d069dbcfb8be219a1d9755c54342e6
2014-04-17Add flag indicating that this impl doesn't require /data.Geremy Condra
This is a prerequisite for hardware-backed FDE. Change-Id: I28c3fe8495d70f54097a6750f8dd27a3613b85d3
2014-01-14am 70d36107: am 711560b6: Merge "Log message spelling correction."Kenny Root
* commit '70d36107318e1d3f7abf62a56279b3f9da3ff000': Log message spelling correction.
2014-01-14am 711560b6: Merge "Log message spelling correction."android-l-preview_r2l-previewKenny Root
* commit '711560b67b176efdcaa3dfe4e5d8fea13e60f01f': Log message spelling correction.
2014-01-14Merge "Log message spelling correction."idea133-weekly-releaseKenny Root
2014-01-13Log message spelling correction.Ian Rogers
Change-Id: I291e2c54544c40ff693f84c237d3bd61c481271c
2013-12-06am 162723c0: am 060bd97e: Merge commit ↵The Android Open Source Project
\'eab8a2ac417ba93bdfb09ddcb6095580a0cef0c4\' into HEAD * commit '162723c02a5f79d64790d3f698a6edd72f969599':
2013-12-05am 060bd97e: Merge commit \'eab8a2ac417ba93bdfb09ddcb6095580a0cef0c4\' into HEADThe Android Open Source Project
* commit '060bd97e948fb35b5dd85f734159c37d882af955':
2013-12-05Merge commit 'eab8a2ac417ba93bdfb09ddcb6095580a0cef0c4' into HEADidea133The Android Open Source Project
2013-11-22am 350fbb78: am 099a9d06: Merge commit ↵The Android Open Source Project
\'7d563651aa956c0f9831b7b64be35c2ec790bdec\' into HEAD * commit '350fbb7868a7f3ddc1fc84ff79f0793b8b530cd8':
2013-11-22am 099a9d06: Merge commit \'7d563651aa956c0f9831b7b64be35c2ec790bdec\' into HEADThe Android Open Source Project
* commit '099a9d06ec12006985a71133de289bdd92eb2f3b':
2013-11-22Merge commit '7d563651aa956c0f9831b7b64be35c2ec790bdec' into HEADThe Android Open Source Project
2013-11-07Merge "keymaster: rename ion_allocation_data.heap_mask to heap_id_mask"Rom Lemarchand
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 06:02:12 +0000