Age | Commit message (Collapse) | Author |
|
am: 58a2d19076 -s ours
Change-Id: I78327987075c0d12166ca34d1a039f00e17fb364
|
|
am: 05c326f69f -s ours
Change-Id: Ia1e341db5e0071e2dfa1f9590ec3105cd51429cf
|
|
am: 0ab01106aa -s ours
Change-Id: Idc91649f214e1ea9381c7af568f85e47735a50df
|
|
am: 99a9876066 -s ours
Change-Id: Id066c16f6c9844ebaf2197c1c647d5d342e3b38c
|
|
62f9d716cd am: c40aced863
am: c187a38651
Change-Id: Iffd56dd83d43ac9822f76346732bc41d84c80d95
|
|
62f9d716cd
am: c40aced863
Change-Id: Id3ed659a318b0e319f47588c8b16eae00bff4cee
|
|
am: 62f9d716cd
Change-Id: Iabf20beb5b064826ca28ac11d5a2bf9a39ad3e6f
|
|
am: 0b06038e14
Change-Id: If19509c6c81b2e57c7e51f838390de150998ff29
|
|
* changes:
Enable arm64 neon scrypt implementation
Mark libscrypt_static as vendor_available
Convert Android.mk to Android.bp
Fix import_scrypt.sh
|
|
It seems that old Scrypt-config.mk is unaware of arm64 architecture.
In fact, crypto_scrypt-neon.c can be compiled into arm64 as well. This
CL adds an arch section for arm64.
Bug: 65425184
Test: adb shell /data/nativetest64/scrypt_test/scrypt_test
Change-Id: Ib451de642c7cc4548bfdc0879781981654b21b8f
Merged-In: If40a30378b8038324aad44071107130d7722e28d
|
|
This commit marks libscrypt_static as vendor_available so that vendor
modules can depend on libscrypt_static.
Bug: 65425184
Test: BOARD_VNDK_VERSION=current mm -j8
Change-Id: I98a99b09b5bf28814ce294337aff97d7bbc837a0
Merged-In: I06bcc80cb71c60d75bf15873632042e72bf3f57c
|
|
This commit converts Android.mk, android-config.mk, Scrypt.mk, and
Scrypt-config.mk files to an Android.bp file.
If BOARD_VNDK_VERSION is set to current, vendor modules won't be allowed
to link libscrypt_static. To make libscrypt_static available to vendor
modules, we have to set vendor_available to true. However,
vendor_available is an Android.bp feature, thus we have to convert
Android.mk to Android.bp first.
Bug: 65425184
Test: mm -j8 && adb sync && adb shell /data/nativetest/scrypt_test/scrypt_test
Test: mm -j8 && adb sync && \
adb shell /data/nativetest64/scrypt_test/scrypt_test
Change-Id: I5f4c574c0ebb00eca4a52ad230dedc4ac05ff711
Merged-In: I8e901b0b1bec172d5e57f529ca76eae1c57def6a
|
|
This commit fixes various issues in import_scrypt.sh:
* Add `-N` option to `diff` command so that arm_neon.diff can be
generated by import_scrypt.sh
* Rename SCRYPT_PATCHES_bionic_SOURCES to
SCRYPT_PATCHES_arm_neon_SOURCES
* Reorder SCRYPT_PATCHES_arm_neon_SOURCES to mimic git-diff output
* Add missing `lib/crypto/crypto_scrypt-sse.c` file for
use_openssl_pbkdf2.patch
* Add `-f` to `rm` command in the `generate` command because `config.h`
is not in the upstream release tarball
* Replace typo `$SCRYPT_DIR_ORIG_ORIG` with `$SCRYPT_DIR_ORIG`
* Rename arm-neon.patch to arm_neon.patch (for consistency)
Bug: 65425184
Test: ./import_scrypt.sh import upstream/scrypt-1.1.6.tgz
Test: ./import_scrypt.sh generate patches/arm_neon.patch \
upstream/scrypt-1.1.6.tgz
Test: ./import_scrypt.sh generate patches/use_openssl_pbkdf2.patch \
upstream/scrypt-1.1.6.tgz
Change-Id: I56d912313e35c1127e18b49cff0b429837b08e77
Merged-In: I843a21440527ed4037525468e9f66630f24b4cee
|
|
It seems that old Scrypt-config.mk is unaware of arm64 architecture.
In fact, crypto_scrypt-neon.c can be compiled into arm64 as well. This
CL adds an arch section for arm64.
Bug: 65425184
Test: adb shell /data/nativetest64/scrypt_test/scrypt_test
Change-Id: If40a30378b8038324aad44071107130d7722e28d
|
|
This commit marks libscrypt_static as vendor_available so that vendor
modules can depend on libscrypt_static.
Bug: 65425184
Test: BOARD_VNDK_VERSION=current mm -j8
Change-Id: I06bcc80cb71c60d75bf15873632042e72bf3f57c
|
|
This commit converts Android.mk, android-config.mk, Scrypt.mk, and
Scrypt-config.mk files to an Android.bp file.
If BOARD_VNDK_VERSION is set to current, vendor modules won't be allowed
to link libscrypt_static. To make libscrypt_static available to vendor
modules, we have to set vendor_available to true. However,
vendor_available is an Android.bp feature, thus we have to convert
Android.mk to Android.bp first.
Bug: 65425184
Test: mm -j8 && adb sync && adb shell /data/nativetest/scrypt_test/scrypt_test
Test: mm -j8 && adb sync && \
adb shell /data/nativetest64/scrypt_test/scrypt_test
Change-Id: I8e901b0b1bec172d5e57f529ca76eae1c57def6a
|
|
This commit fixes various issues in import_scrypt.sh:
* Add `-N` option to `diff` command so that arm_neon.diff can be
generated by import_scrypt.sh
* Rename SCRYPT_PATCHES_bionic_SOURCES to
SCRYPT_PATCHES_arm_neon_SOURCES
* Reorder SCRYPT_PATCHES_arm_neon_SOURCES to mimic git-diff output
* Add missing `lib/crypto/crypto_scrypt-sse.c` file for
use_openssl_pbkdf2.patch
* Add `-f` to `rm` command in the `generate` command because `config.h`
is not in the upstream release tarball
* Replace typo `$SCRYPT_DIR_ORIG_ORIG` with `$SCRYPT_DIR_ORIG`
* Rename arm-neon.patch to arm_neon.patch (for consistency)
Bug: 65425184
Test: ./import_scrypt.sh import upstream/scrypt-1.1.6.tgz
Test: ./import_scrypt.sh generate patches/arm_neon.patch \
upstream/scrypt-1.1.6.tgz
Test: ./import_scrypt.sh generate patches/use_openssl_pbkdf2.patch \
upstream/scrypt-1.1.6.tgz
Change-Id: I843a21440527ed4037525468e9f66630f24b4cee
|
|
581021037c am: ffa1823922
am: 9af45b8544
Change-Id: I1855c2a0f3e948ae88309dc510aab345586a539b
|
|
581021037c
am: ffa1823922
Change-Id: Idf17477f118123e63776cd267b57f4806772008a
|
|
am: 581021037c
Change-Id: Iadb6fc6102e2e03fdc88875f45a130d488c18b9b
|
|
am: a1026771cc
Change-Id: Ic67ebd42bf2aa2ea81a52d013241baea333136aa
|
|
|
|
libnativeheader exports headers under nativeheader. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: modules using external/scrypt find headers
Bug: 63762847
Change-Id: I9baf896015a1920f8a26daa2a0c549169628890f
|
|
a0a2dc382e
am: 28f5f2d2a3
Change-Id: Ia3d87eabbdce6b5ca695c1ccf85fdf42ae887c4e
|
|
am: a0a2dc382e
Change-Id: I3c42d68505db6adcbf6aef205c2e3cbdef6bb8cd
|
|
am: e236788532
Change-Id: I660b36c7e5cbc4534a89cabf430a588397c8e786
|
|
am: b7477d8eed
Change-Id: Ifdd24e0a245e69ba381ec28f678f84fb8babff0f
|
|
|
|
* Owners are selected from top CL approvals or owners.
They will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I41d1076af8926ae570cffd7f3341a4c76f2dc196
|
|
4b2bd9665c am: b442b13773 am: 32be729d37
am: 99611dfb9a
Change-Id: I6336d3574bef526024a7ce10cf4e736565d9dd51
|
|
am: b442b13773
am: 32be729d37
Change-Id: I13fec30c977a102b14e94b326ee292a64f79a17f
|
|
am: b442b13773
Change-Id: I1b431113bfa436546c18f4bd361766ec237274d4
|
|
am: 4b2bd9665c
Change-Id: Icd4ce38a012e91a709de21b1c377c580cdc12599
|
|
|
|
There's no need to use a different name for target and host moudles. In
Soong, it's better to use the same for both, as target and host modules
can be defined at the same time.
Change-Id: I47f356b4fdde5b3a0b75862b1e9d91723ca06f27
|
|
3608597959 am: 540c0274be
am: e078c5e5f6
* commit 'e078c5e5f609e3441212c6b00e038fc014cc6daa':
scrypt doesn't need <machine/cpu-features.h>.
Change-Id: I3c54d96e44eccd15413831bdaef63a879d6d8dd6
|
|
3608597959
am: 540c0274be
* commit '540c0274bedb28050223c305f9a5499b06df328e':
scrypt doesn't need <machine/cpu-features.h>.
Change-Id: I6242ca18c85c3cd98b9f4a558d54f934c6c5409b
|
|
am: 3608597959
* commit '36085979592293853cb18fadb61358f5b7f4f717':
scrypt doesn't need <machine/cpu-features.h>.
Change-Id: I724c161acbb6b2caa6ba9d438c1325e95ad4b830
|
|
am: e6e09c358c
* commit 'e6e09c358c249191cf3afa0e44db95b45ea332c4':
scrypt doesn't need <machine/cpu-features.h>.
Change-Id: Ia87611af260d74930786c044475da06928ab5d6b
|
|
|
|
Bug: http://b/18556103
Change-Id: Ibccef334b4d1a2e68e327fc8b73e62e62d13df32
|
|
|
|
Bug: http://b/16574165
Change-Id: Ieb63fb6a73f0fb2ab3260bc5eabca7d86d892fbd
|
|
|
|
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: I1bc36094ecbc4ed2d9a4c62498f05580770f4a8a
|
|
|
|
The build system does this for us. Since libgtest is the stlport
version of the library, this causes build breakages when libc++ is the
default STL.
Bug: 15193147
Change-Id: Ief6f539de36f38d38bd1460b17efcdc09114d64d
|
|
|
|
Since some of the test's dependencies use clang, ASAN_ALL will cause
those to be built with ASAN instrumentation, meaning the final
executable needs to be linked with ASAN's runtime libraries.
The simple fix is to just move the test to clang to let it link with
ASAN when ASAN_ALL is provided.
Change-Id: I8d134667347ec45fe59d557e3c792520eaf62f1b
|
|
|