summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of ↵HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-13.0+r22stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kcm-13.0Steve Kondik2016-03-110-0/+0
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/hardware/qcom/keymaster into cm-13.0 Android 6.0.1 release 22 Change-Id: I2bf69d38bc65e262c5279943c4bf4b394b86b56a
| * Remove legacy keymaster support for msm8226Uday Kishore Pasupuleti2015-09-161-1/+1
| | | | | | | | | | Change-Id: I733a6b15d1b9c2cb163a6f65eb3fe64e3fced516 Signed-off-by: Uday Kishore Pasupuleti <upasupul@codeaurora.org>
* | keymaster: add msm8909 into support listEdward Wang2016-02-231-1/+1
| | | | | | | | | | | | Issue-Id: FEIJ-8 Change-Id: I1252ec5f1171ca94635e6f58d835a588948be771
* | Disable ION_HEAP_MASK_COMPATIBILITY_WA on Sony 3.10 KernelAdam Farden2016-01-201-0/+2
| | | | | | | | | | | | | | | | | | Set SONY_BF64_KERNEL_VARIANT := true, the same flag as used in build/ to pick the HALs Signed-off-by: Adam Farden <adam@farden.cz> Signed-off-by: Chirayu Desai <chirayudesai1@gmail.com> Change-Id: Id08346823701bc7cd97414ca2743f3719a998973
* | keymaster: Allow 8952 to buildEthan Chen2015-12-241-1/+1
| | | | | | | | Change-Id: I9c2d5a0e4fc584f7909e0733827d5499191d82a3
* | keymaster: add TARGET_PROVIDES_KEYMASTERKeith Mok2015-12-041-0/+2
| | | | | | | | | | | | | | | | Qcom makes keymaster a propertiies blob in M. To maintain compatibility with Cyanogenmod builds, add a flag to optionally disable building keymaster here. Change-Id: Ibb95cb54651ec5af266504e66f1078adaa53c0d8
* | keymaster: Featureize support for waiting on QSEE to startmyfluxi2015-11-042-0/+7
| | | | | | | | | | | | | | | | | | | | | | New devices need to wait for QSEE to load the Keymaster into TZ. This is signalled by a property being set by qseecomd. Unfortunately we don't have a good way to determine if this is the case for a particular device, so make it opt-in. Set TARGET_KEYMASTER_WAIT_FOR_QSEE=true for this behavior. Change-Id: I99839b82fdd8ab6550a95e2676a5da03eccfe288
* | Keymaster: Check if keymaster TZ app is loadedJyoti Wadhwani2015-10-302-1/+27
| | | | | | | | | | | | | | qseecomd sets a property to indicate that it has successfully loaded keymaster TZ app. This change checks waits until that property is set Change-Id: I3533ba7489ab2d7d85473821557e4ddf0119cf6f
* | keymaster: Add kernel dependencySteve Kondik2015-10-151-1/+3
| | | | | | | | Change-Id: I6ff0b7995ac19d272c088e6210638cdcd48bc4de
* | keymaster: Set HEAP_MASK_COMPATIBILITY by platform for QCOM_HARDWAREEthan Chen2015-10-141-0/+6
| | | | | | | | | | | | | | * Google kernels have a separate hack to handle this, only set by platform for QCOM_HARDWARE devices. Change-Id: Iab91cee4922e1b3467691a04eb1c5061705fbab3
* | keymaster: Fix build for devices that don't define BOARD_USES_QCOM_HARDWAREdhacker292015-10-141-1/+1
| | | | | | | | Change-Id: Ia80c28920ac8d8fd0ce3ac703977dc8a5a0651ce
* | keymaster: restore $(TARGET_BOARD_PLATFORM).repo Shareef Ali2015-10-141-1/+1
| | | | | | | | Change-Id: I8f914ffa5765fd2dd62b884444a04c5b75b036ab
* | Keymaster: Support for 64bit userspace and 32bit TZJyoti Wadhwani2015-10-143-21/+29
|/ | | | | | | | | HW keymaster is not supported for 64bit userspace. This patch updates variable types to support the architecture. It also makes change in Android.mk file to support all qcom platforms. Change-Id: I25633d707b425388bcc116196c0e0022c5c4f9a5
* am 56d7d4bc: am d2bdc571: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-03-251-2/+1
|\ | | | | | | | | * commit '56d7d4bc5fedf324f63727480a7f54809a445638': Remove superfluous OpenSSL include paths.
| * am d2bdc571: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-03-251-2/+1
| |\ | | | | | | | | | | | | * commit 'd2bdc5718c2f1b64a740a0601a544241f503e1f0': Remove superfluous OpenSSL include paths.
| | * Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-03-251-2/+1
| | |\
| | | * Remove superfluous OpenSSL include paths.Adam Langley2015-01-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am fb378aec: am 26391c90: Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden2015-02-260-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'fb378aecff0b635f72614e5b0f8cca36271051d1': Separate keymaster0 and keymaster1 HALs.
| * | | am 26391c90: Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden2015-02-260-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '26391c901ef37d80ee5fa4ea3ef68d777df53c35': Separate keymaster0 and keymaster1 HALs.
| | * | Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden2015-02-261-9/+9
| | |\ \ | | | |/ | | |/|
| | | * Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-241-9/+9
| | |/ | | | | | | | | | Change-Id: I5c54282c12d1c4b8b22ed4929b6e6c724a94ede4
* | | am b00de244: Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-260-0/+0
|\| | | | | | | | | | | | | | * commit 'b00de24410696c4b10af0d96d64a5331393998ad': Separate keymaster0 and keymaster1 HALs.
| * | Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-251-9/+9
| |/ | | | | | | Change-Id: I5c54282c12d1c4b8b22ed4929b6e6c724a94ede4
* / Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-251-9/+9
|/ | | | Change-Id: I5c54282c12d1c4b8b22ed4929b6e6c724a94ede4
* am 2d8aa1e3: merge in master-release history after reset to ↵The Android Automerger2014-06-060-0/+0
|\ | | | | | | | | | | | | f4191b59196237680f3ebc8fc2af62b36d9c25f9 * commit '2d8aa1e31fda7fd88c1b2d99c976832dd5374490': Set correct module version for qcom keystore
| * merge in master-release history after reset to ↵The Android Automerger2014-05-220-0/+0
| |\ | | | | | | | | | f4191b59196237680f3ebc8fc2af62b36d9c25f9
| | * merge in master-release history after reset to ↵The Android Automerger2014-05-220-0/+0
| |/| | | | | | | | | | f4191b59196237680f3ebc8fc2af62b36d9c25f9
| | * merge in master-release history after reset to ↵The Android Automerger2014-05-210-0/+0
| |/| | | | | | | | | | f4191b59196237680f3ebc8fc2af62b36d9c25f9
| | * merge in master-release history after reset to ↵The Android Automerger2014-05-200-0/+0
| |/| | | | | | | | | | f4191b59196237680f3ebc8fc2af62b36d9c25f9
| | * merge in master-release history after reset to ↵The Android Automerger2014-05-190-0/+0
| |/| | | | | | | | | | f4191b59196237680f3ebc8fc2af62b36d9c25f9
| | * merge in master-release history after reset to ↵The Android Automerger2014-05-180-0/+0
| |/| | | | | | | | | | f4191b59196237680f3ebc8fc2af62b36d9c25f9
| | * merge in master-release history after reset to ↵The Android Automerger2014-05-170-0/+0
| |/| | | | | | | | | | f4191b59196237680f3ebc8fc2af62b36d9c25f9
| | * merge in master-release history after reset to ↵The Android Automerger2014-05-150-0/+0
| |/| | | | | | | | | | f4191b59196237680f3ebc8fc2af62b36d9c25f9
| | * merge in master-release history after reset to ↵The Android Automerger2014-05-140-0/+0
| |/| | | | | | | | | | f4191b59196237680f3ebc8fc2af62b36d9c25f9
| | * merge in master-release history after reset to ↵The Android Automerger2014-05-130-0/+0
| |/| | | | | | | | | | f4191b59196237680f3ebc8fc2af62b36d9c25f9
| | * merge in master-release history after reset to ↵The Android Automerger2014-05-120-0/+0
| |/| | | | | | | | | | f4191b59196237680f3ebc8fc2af62b36d9c25f9
| | * merge in master-release history after reset to ↵The Android Automerger2014-05-110-0/+0
| |/| | | | | | | | | | f4191b59196237680f3ebc8fc2af62b36d9c25f9
| | * merge in master-release history after reset to ↵The Android Automerger2014-05-100-0/+0
| |/| | | | | | | | | | f4191b59196237680f3ebc8fc2af62b36d9c25f9
| | * merge in master-release history after reset to ↵The Android Automerger2014-05-080-0/+0
| |/| | | | | | | | | | f4191b59196237680f3ebc8fc2af62b36d9c25f9
| | * Set correct module version for qcom keystorePaul Lawrence2014-05-072-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Requires https://android-review.googlesource.com/#/c/93571/ Bug: 14384714 Change-Id: I1544b9b2d4d069dbcfb8be219a1d9755c54342e6
* | | keymaster: fix QSEEComAPI lookup pathMekala Natarajan2014-06-041-1/+1
| | | | | | | | | | | | | | | | | | Drop absolute path from libQSEEComAPI dlopen. Change-Id: I285b7fa4766bf5350dac69c1f530e9caae3bd844
* | | keymaster: Build keymaster for msm8084Naveen Ramaraj2014-06-033-3/+14
|/ / | | | | | | | | | | Also update the hal to work with ION changes Change-Id: I0c5abfa109119966c82a5d9cc025610cd89f9fd0
* / Set correct module version for qcom keystorePaul Lawrence2014-05-062-3/+3
|/ | | | | | | Requires https://android-review.googlesource.com/#/c/93571/ Bug: 14384714 Change-Id: I1544b9b2d4d069dbcfb8be219a1d9755c54342e6
* Add flag indicating that this impl doesn't require /data.Geremy Condra2014-04-171-1/+1
| | | | | | This is a prerequisite for hardware-backed FDE. Change-Id: I28c3fe8495d70f54097a6750f8dd27a3613b85d3
* am 70d36107: am 711560b6: Merge "Log message spelling correction."Kenny Root2014-01-141-1/+1
|\ | | | | | | | | * commit '70d36107318e1d3f7abf62a56279b3f9da3ff000': Log message spelling correction.
| * am 711560b6: Merge "Log message spelling correction."Kenny Root2014-01-141-1/+1
| |\ | | | | | | | | | | | | * commit '711560b67b176efdcaa3dfe4e5d8fea13e60f01f': Log message spelling correction.
| | * Merge "Log message spelling correction."Kenny Root2014-01-141-1/+1
| | |\
| | | * Log message spelling correction.Ian Rogers2014-01-131-1/+1
| | |/ | | | | | | | | | Change-Id: I291e2c54544c40ff693f84c237d3bd61c481271c
* | | am 162723c0: am 060bd97e: Merge commit ↵The Android Open Source Project2013-12-060-0/+0
|\| | | | | | | | | | | | | | | | | \'eab8a2ac417ba93bdfb09ddcb6095580a0cef0c4\' into HEAD * commit '162723c02a5f79d64790d3f698a6edd72f969599':
| * | am 060bd97e: Merge commit \'eab8a2ac417ba93bdfb09ddcb6095580a0cef0c4\' into HEADThe Android Open Source Project2013-12-050-0/+0
| |\| | | | | | | | | | * commit '060bd97e948fb35b5dd85f734159c37d882af955':
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 12:08:00 +0000