summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-08Snap for 6663666 from b8e66a8dff92ab0019d0d506208a92de3a3e197d to ↵android-11.0.0_r31android-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_r18android11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid-build-team Robot
rvc-qpr1-release Change-Id: I441186a0665b2ec3a538d2d09cf4597aaa8ada91
2020-07-08Link libcrypto with -Bsymbolic. am: 6453437ecc am: e864986f14android-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_r30android11-qpr2-releaseandroid11-qpr1-c-releasePete Bentley
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/boringssl/+/12108886 Change-Id: I29bd6e8d896b4277002b139f843e2ad86dd080f8
2020-07-08Link libcrypto with -Bsymbolic. am: 6453437eccandroid-11.0.0_r16android11-d1-b-releasePete Bentley
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/boringssl/+/12108886 Change-Id: I5b94dad6c729b4888c1849ad2b83c01f9efd16fd
2020-07-08Link libcrypto with -Bsymbolic.android11-devPete Bentley
Prevents crypto-related symbols from being resolved from libraries earlier in the search path and e.g. breaking the FIPS integrity checks. Bug: 160231064 Test: m && flashall Change-Id: I9c9f7139f518770b4553e89d91f9a69aa700478e (cherry picked from commit 1e9e5857536942a4cc097a38d4331e27c4172d00)
2020-05-12Disable ASAN for libcrypto. am: 2267f65417 am: 5fb8f8641fPete Bentley
Change-Id: Ic09f3624612b516e1ebd75db8d86495f178ae965
2020-05-12Disable ASAN for libcrypto. am: 2267f65417Pete Bentley
Change-Id: I72f85516413648217ce95e294f439780d632bcda
2020-05-12Disable ASAN for libcrypto.Pete Bentley
If address sanitizing is enabled, libcrypto will not report itself as being in FIPS mode, which causes boringssl_self_test to fail putting the device into a boot loop. Rather than risk modifying libcrypto or boringssl_self_test, this disables ASAN for libcrypto. HWASAN is unaffacted and still available for use with libcrypto. The BoringSSL team do extensive ASAN testing so the risk of this change masking bugs is low. Bug: 154681903 Test: Build and boot with SANITIZE_TARGET=address Change-Id: Iaad8d45fa5f007448e5f81b8864dd687931db270 Merged-In: Iaad8d45fa5f007448e5f81b8864dd687931db270 (cherry picked from commit e0c3f631710669d25e542b82ad8faaa08f36adf3)
2020-04-27Set min_sdk_version to be part of mainline modules am: df4e4d863a am: 13837a386fJooyung Han
Change-Id: Ie72bc792b58307c40314bb5d11fe051e3d8fd6d3
2020-04-27Set min_sdk_version to be part of mainline modules am: df4e4d863aJooyung Han
Change-Id: I2dca71d13ca74d56c538f946ee5b3a2b3eb7cfe3
2020-04-27Set min_sdk_version to be part of mainline modulesJooyung Han
Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Bug: 152655956 Test: m Merged-In: I880abf1c2e80c76bb6efaa71f530ef18aa86c358 Change-Id: I880abf1c2e80c76bb6efaa71f530ef18aa86c358 (cherry picked from commit 856ad1d402002ab72041989b0ec878afd9e576f9)
2020-04-21Set apex_available property am: 53d5f9f81a am: 8aa8efee20Jiyong Park
Change-Id: I0a8233a544d2a33637cb4c3621664881dfbcbed2
2020-04-21Set apex_available property am: eb9e618c70 am: 1c40a69cc8Jiyong Park
Change-Id: I10dedbc1722a89230e4a39d45c3e091968aa7f0f
2020-04-21Set apex_available property am: 53d5f9f81aJiyong Park
Change-Id: Iac05d51993d97f476d8724eeafba1b095077ca73
2020-04-21Set apex_available property am: eb9e618c70Jiyong Park
Change-Id: I927858672e84da51ddfd44ae7fdc69368ec40dea
2020-04-20Set apex_available propertyJiyong Park
The marked library(ies) were available to the APEXes via the hand-written whitelist in build/soong/apex/apex.go. Trying to remove the whitelist by adding apex_available property to the Android.bp of the libraries. Exempt-From-Owner-Approval: cherry-pick from AOSP Bug: 150999716 Test: m Merged-In: Id1a8a62b3213cf73b1f3a20846f70ead02b30fcc (cherry picked from commit d87b59064910a08b879f168bb5105fb93ac9bdff) Change-Id: Id1a8a62b3213cf73b1f3a20846f70ead02b30fcc
2020-04-20Set apex_available propertyJiyong Park
The marked library(ies) were available to the APEXes via the hand-written whitelist in build/soong/apex/apex.go. Trying to remove the whitelist by adding apex_available property to the Android.bp of the libraries. Exempt-From-Owner-Approval: cherry-pick from aosp Bug: 150999716 Test: m Merged-In: I1fc4aca9841f5a6d750522eca36ed75c723f3f2a (cherry picked from commit 0dcd4e8262f521f08a8302051ad6c81489f05754) Change-Id: I1fc4aca9841f5a6d750522eca36ed75c723f3f2a
2020-02-12Merge "Make libcrypto_static apex-available for com.android.neuralnetworks." ↵Automerger Merge Worker
am: 18c89d6730 am: 0e2a6be6fe am: ab577713e9 Change-Id: Ica5f7b525f409c8d21cbab9eb9b9b17ceee34388
2020-02-12Merge "Make libcrypto_static apex-available for com.android.neuralnetworks." ↵Automerger Merge Worker
am: 18c89d6730 am: 0e2a6be6fe Change-Id: I5e2bce85083ba3efdb382fc495235dcd6348f1ef
2020-02-12Merge "Make libcrypto_static apex-available for com.android.neuralnetworks." ↵Automerger Merge Worker
am: 18c89d6730 Change-Id: I6db3d8fbc6e26faf44c4da6e7f458239a8b5ac4d
2020-02-12Merge "Make libcrypto_static apex-available for com.android.neuralnetworks."Przemyslaw Szczepaniak
2020-02-12Make libcrypto_static apex-available for com.android.neuralnetworks.Przemyslaw Szczepaniak
Test: coral-userdebug build Bug: 148593574 Change-Id: I22076d876894db060cb8fef0c1fd21bdac521cd1
2020-02-11Set apex_available for libssl, libcrypto. am: 26b57e250f am: 905d1bd434 am: ↵Automerger Merge Worker
9d3e8b016a Change-Id: I062f5a9083fbb396b43b9ab444a9c0159774b445
2020-02-11Set apex_available for libssl, libcrypto. am: 26b57e250f am: 905d1bd434Automerger Merge Worker
Change-Id: I4bedc131ae3d8c8ea73b534c3d8140bfea3e9064
2020-02-11Set apex_available for libssl, libcrypto. am: 26b57e250fAutomerger Merge Worker
Change-Id: Iefe389cadf329ff3f7e96c98ec45cc8e457a3e02
2020-02-10Set apex_available for libssl, libcrypto.Joshua Duong
Bug: 149181583 Bug: 111434128 Bug: 147364041 Test: make Change-Id: I7a9a239210b786c6d914908626f06be720573b8c
2020-02-04Make libcrypto_static visible to frameworks/ml/nn/common libraries. am: ↵Automerger Merge Worker
243d9d538d am: f4628633bc am: a6f93aefc6 Change-Id: I17cefe849b77b0b49f7ce906b25d5a60bef07797
2020-02-04Make libcrypto_static visible to frameworks/ml/nn/common libraries. am: ↵Automerger Merge Worker
243d9d538d am: f4628633bc Change-Id: I8a7381bf5cafcfb100e526224cb639c9ef3d4648
2020-02-04Make libcrypto_static visible to frameworks/ml/nn/common libraries. am: ↵Automerger Merge Worker
243d9d538d Change-Id: I1e273dc022f080033b6fc99115d73deda8aa0699
2020-02-03Make libcrypto_static visible to frameworks/ml/nn/common libraries.android-r-preview-1Przemyslaw Szczepaniak
I'm trying to switch all NNAPI libraries to use the libcrypto_static. Otherwise, Soong sees both libcrypto & libcrypto_static as com.android.neualnetworks dependencies, while we need only need one, the static variant. Test: build crosshatch & flashed device. Bug: 148593574 Change-Id: I113893acf8846d56a0ebf60bce55088de6a33ea8
2020-01-23Merge "Allow DRM 1.3 VTS to use libcrypto_static."TreeHugger Robot
2020-01-21[automerger skipped] Allow KM4.1 VTS to use libcrypto_static. am: 2d2941f4a1 ↵Automerger Merge Worker
am: fa75a079cb am: 230bcc9e53 -s ours am skip reason: Change-Id Ic584298482a2b0f9af6dbd5288a9d0b8d50ec8cf with SHA-1 1ff77d000f is in history Change-Id: I4642ead147ab8b2c6b5b5e4ea0576389a04960c4
2020-01-21Allow KM4.1 VTS to use libcrypto_static. am: 2d2941f4a1 am: fa75a079cbAutomerger Merge Worker
Change-Id: Ib4e88008ebb54a92807ae05f2f056b00eace510a
2020-01-21Allow KM4.1 VTS to use libcrypto_static.Shawn Willden
am: 2d2941f4a1 Change-Id: I0db9ca33383d981a4a2e8ccfb218d720938c8122
2020-01-21Allow DRM 1.3 VTS to use libcrypto_static.Robert Shih
Bug: 139134043 Test: VtsHalDrmV1_3Target Change-Id: Ib56826789a811f371f2a32594ea4d3043c658968
2020-01-17Allow KM4.1 VTS to use libcrypto_static.Shawn Willden
Test: VtsHalKeymasterV4_1TargetTest Change-Id: Ic584298482a2b0f9af6dbd5288a9d0b8d50ec8cf Merged-In: Ic584298482a2b0f9af6dbd5288a9d0b8d50ec8cf
2020-01-17Allow KM4.1 VTS to use libcrypto_static.Shawn Willden
Test: VtsHalKeymasterV4_1TargetTest Change-Id: Ic584298482a2b0f9af6dbd5288a9d0b8d50ec8cf
2020-01-17Merge "Trusty: update architecture source files for Trusty" am: 8e6bcab360 ↵Automerger Merge Worker
am: 19ba2abfd7 am: 3b9cd89761 Change-Id: I443ff735c9c4c6df73a2c7b49a5107c3deb27b66
2020-01-17Merge "Trusty: update architecture source files for Trusty" am: 8e6bcab360 ↵Automerger Merge Worker
am: 19ba2abfd7 Change-Id: I050860b792d1dd72dfc5ad056fc6c398a299dbc6
2020-01-17Merge "Trusty: update architecture source files for Trusty" am: 8e6bcab360Automerger Merge Worker
Change-Id: I5b3a323759e111a34c7c602473ac1e525e213238
2020-01-17Merge "Trusty: update architecture source files for Trusty"Kenny Root
2020-01-03boringssl: Delegate to conscrypt OWNERS. am: cdee22e79e am: 84b547b0c3 am: ↵Automerger Merge Worker
64a6475701 Change-Id: Ifaff3bae2eb077d8bbde0f5ccde6fe91459a696d
2020-01-03boringssl: Delegate to conscrypt OWNERS. am: cdee22e79e am: 84b547b0c3Automerger Merge Worker
Change-Id: I04a9ee5853f300f011adfc90e7a60223cde65687
2020-01-03boringssl: Delegate to conscrypt OWNERS.Tobias Thierer
am: cdee22e79e Change-Id: I153e2422e2eb10a56b54a0073489c32ec7bc4d75
2020-01-02boringssl: Delegate to conscrypt OWNERS.Tobias Thierer
Lists of individual owners tend to become obsolete quickly as people move between teams. Delegating to conscrypt OWNERS ensures that enough owners are available and that they stay up-to-date. Also, added Conscrypt's component ID for bugs. Bug: 147092934 Test: Treehugger Change-Id: Ia904a634bf7e7213077ffe22e478d1e8e5bd501f
2019-12-10Disable fuzzer on boringssl's bcm_object. am: f5a60789f8 am: 6c3af2a49b am: ↵Automerger Merge Worker
0b9d9d9791 Change-Id: Iee7b92ed7e7156cbfb8add42f2050f0d2d7f4185
2019-12-10Disable fuzzer on boringssl's bcm_object. am: f5a60789f8Mitch Phillips
am: 6c3af2a49b Change-Id: If1901efcdcd5954dfb3ce1a07e58f00d6b330ba6
2019-12-10Disable fuzzer on boringssl's bcm_object.Mitch Phillips
am: f5a60789f8 Change-Id: I7acf256b35d891f1629a06d115bcc97cbacba2db
2019-12-10Disable fuzzer on boringssl's bcm_object.Mitch Phillips
boringssl does some weird packaging with bcm_object in order to comply with FIPS certification. I believe that -fsanitize=fuzzer-no-link here is causing additional sections to be emitted in bcm_object, and these sections are being discarded by the linkerscript. These sections are actually required though, and lld complains about this by SEGV-ing (a known problem with lld). We fix this already with ASan and HWASan by disabling their instrumentation for this object, we can do the same with sanitizer coverage (fuzzer). Fixes: 144104643 Test: SANITIZE_TARGET=fuzzer make droid Change-Id: Iaafbfb90ae963f88120406439d1a24e65be22e92
2019-12-04Enable windows build for libssl. am: 81ce7a5b19 am: 2c029aad86Automerger Merge Worker
Change-Id: I718bb63927062663b1f8cf600d993c6ce4559c1b
2019-12-04Enable windows build for libssl. am: 81ce7a5b19Joshua Duong
am: 71c4408539 Change-Id: I8c7865e959a1418f4c4de4e4cfede5115c4e668f