GitLab

Change-Id: I9df312fc2f887372e3fdb35863fa572020eb36f2

I thought we were always building the tests again? Clearly not.

Change-Id: I7a31aade86254a4860980ee9fb75814622dd8500

Change-Id: I2b5c5dda648a95900ec5741fbff21af198a84d1c

* commit '2770c778':

Change-Id: Idfad92a981e87129d5968ffa5a5bedf2c774a6fd

Manually patch the ICU.cpp changes into libcore_icu_ICU.cpp. Also remove the
whole sentence from the class documentation, since it looks rather odd without
the bit that would refer to @hidden API.

Bug: 3484927
Change-Id: I1ea046e18949ad5bfa7f4512df1f481c81a94310

Change-Id: Ie006ff7b00c062035152855b19b3728e95ef01fd

* commit '067df9c5':
  CA certificate update

Change-Id: Ie05bce019e0aa04dae9b21029dcbad2c2857b1b7

Remove unused dalvik.annotations related to tests

    dalvik.annotation.HostController
    dalvik.annotation.TestInfo
    dalvik.annotation.TestStatus
    dalvik.annotation.Timeout
    dalvik.annotation.VirtualTestTarget

Deprecate two public dalvik.annotations related to tests. While they
appear in the api xml files, they aren't show in our javadoc.

    dalvik.annotation.TestTarget
    dalvik.annotation.TestTargetClass

Change-Id: I2f2aa41da0941718e4717d7ee8021606910f75f2

Also clean up the implementation a bit, fix a long-standing
serialization bug, and improve the documentation.

Bug: 3484927
Change-Id: I5e5270b1b1cdac69b6d7f51b8460896692040a12

Bug: 3484927
Change-Id: Ic5305c852ed8079d958d8ab7c46fe10cceac60d4

Change-Id: I5b50744d75c38b56d6ad580f4891a1f78776113c

* commit 'cc555b2c':
  print alias in test_KeyStore_cacerts_bks on failure

* commit '833a9b99':
  CA certificate update

Added and removed expired CAs in cacerts directory with summary below.
Regenerated cacerts.bks

Remove   SHA1      : 9F:C7:96:E8:F8:52:4F:86:3A:E1:49:6D:38:12:42:10:5F:1B:78:F5
         Subject   : C=DE, ST=Hamburg, L=Hamburg, O=TC TrustCenter for Security in Data Networks GmbH, OU=TC TrustCenter Class 3 CA/emailAddress=certificate@trustcenter.de

Remove   SHA1      : 83:8E:30:F7:7F:DD:14:AA:38:5E:D1:45:00:9C:0E:22:36:49:4F:AA
         Subject   : C=DE, ST=Hamburg, L=Hamburg, O=TC TrustCenter for Security in Data Networks GmbH, OU=TC TrustCenter Class 2 CA/emailAddress=certificate@trustcenter.de

Added    SHA1      : 4A:BD:EE:EC:95:0D:35:9C:89:AE:C7:52:A1:2C:5B:29:F6:D6:AA:0C
         Subject   : C=EU, L=Madrid (see current address at www.camerfirma.com/address)/serialNumber=A82743287, O=AC Camerfirma S.A., CN=Global Chambersign Root - 2008

Added    SHA1      : 03:9E:ED:B8:0B:E7:A0:3C:69:53:89:3B:20:D2:D9:32:3A:4C:2A:FD
         Subject   : C=US, O=GeoTrust Inc., OU=(c) 2008 GeoTrust Inc. - For authorized use only, CN=GeoTrust Primary Certification Authority - G3

Added    SHA1      : 59:AF:82:79:91:86:C7:B4:75:07:CB:CF:03:57:46:EB:04:DD:B7:16
         Subject   : C=NL, O=Staat der Nederlanden, CN=Staat der Nederlanden Root CA - G2

Added    SHA1      : DD:E1:D2:A9:01:80:2E:1D:87:5E:84:B3:80:7E:4B:B1:FD:99:41:34
         Subject   : C=TR, O=Elektronik Bilgi Guvenligi A.S., CN=e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi

Added    SHA1      : F1:8B:53:8D:1B:E9:03:B6:A6:F0:56:43:5B:17:15:89:CA:F3:6B:F2
         Subject   : C=US, O=thawte, Inc., OU=Certification Services Division, OU=(c) 2008 thawte, Inc. - For authorized use only, CN=thawte Primary Root CA - G3

Added    SHA1      : AE:C5:FB:3F:C8:E1:BF:C4:E5:4F:03:07:5A:9A:E8:00:B7:F7:B6:FA
         Subject   : C=ES, CN=Autoridad de Certificacion Firmaprofesional CIF A62634068

Added    SHA1      : E0:B4:32:2E:B2:F6:A5:68:B6:54:53:84:48:18:4A:50:36:87:43:84
         Subject   : CN=ACEDICOM Root, OU=PKI, O=EDICOM, C=ES

Added    SHA1      : FA:B7:EE:36:97:26:62:FB:2D:B0:2A:F6:BF:03:FD:E8:7C:4B:2F:9B
         Subject   : C=RO, O=certSIGN, OU=certSIGN ROOT CA

Added    SHA1      : 67:65:0D:F1:7E:8E:7E:5B:82:40:A4:F4:56:4B:CF:E2:3D:69:C6:F0
         Subject   : C=TW, O=Chunghwa Telecom Co., Ltd., OU=ePKI Root Certification Authority

Added    SHA1      : 89:DF:74:FE:5C:F4:0F:4A:80:F9:E3:37:7D:54:DA:91:E1:01:31:8E
         Subject   : C=HU, L=Budapest, O=Microsec Ltd., CN=Microsec e-Szigno Root CA 2009/emailAddress=info@e-szigno.hu

Added    SHA1      : 06:08:3F:59:3F:15:A1:04:A0:69:A4:6B:A9:03:D0:06:B7:97:09:91
         Subject   : C=HU, L=Budapest, O=NetLock Kft., OU=Tan\xC3\xBAs\xC3\xADtv\xC3\xA1nykiad\xC3\xB3k (Certification Services), CN=NetLock Arany (Class Gold) F\xC5\x91tan\xC3\xBAs\xC3\xADtv\xC3\xA1ny

Added    SHA1      : D6:DA:A8:20:8D:09:D2:15:4D:24:B5:2F:CB:34:6E:B2:58:B2:8A:58
         Subject   : C=HK, O=Hongkong Post, CN=Hongkong Post Root CA 1

Added    SHA1      : 61:57:3A:11:DF:0E:D8:7E:D5:92:65:22:EA:D0:56:D7:44:B3:23:71
         Subject   : C=NO, O=Buypass AS-983163327, CN=Buypass Class 3 CA 1

Added    SHA1      : 40:9D:4B:D9:17:B5:5C:27:B6:9B:64:CB:98:22:44:0D:CD:09:B8:89
         Subject   : emailAddress=pki@sk.ee, C=EE, O=AS Sertifitseerimiskeskus, CN=Juur-SK

Added    SHA1      : 3B:C4:9F:48:F8:F3:73:A0:9C:1E:BD:F8:5B:B1:C3:65:C7:D8:11:B3
         Subject   : C=JP, O=Japan Certification Services, Inc., CN=SecureSign RootCA11

Added    SHA1      : 7F:8A:B0:CF:D0:51:87:6A:66:F3:36:0F:47:C8:8D:8C:D3:35:FC:74
         Subject   : C=JP, O=Japanese Government, OU=ApplicationCA

Added    SHA1      : 36:79:CA:35:66:87:72:30:4D:30:A5:FB:87:3B:0F:A7:7B:B7:0D:54
         Subject   : C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 2008 VeriSign, Inc. - For authorized use only, CN=VeriSign Universal Root Certification Authority

Added    SHA1      : 8B:AF:4C:9B:1D:F0:2A:92:F7:DA:12:8E:B9:1B:AC:F4:98:60:4B:6F
         Subject   : C=CN, O=CNNIC, CN=CNNIC ROOT

Added    SHA1      : 8C:96:BA:EB:DD:2B:07:07:48:EE:30:32:66:A0:F3:98:6E:7C:AE:58
         Subject   : CN=EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xC4\xB1c\xC4\xB1s\xC4\xB1, O=EBG Bili\xC5\x9Fim Teknolojileri ve Hizmetleri A.\xC5\x9E., C=TR

Added    SHA1      : 2A:C8:D5:8B:57:CE:BF:2F:49:AF:F2:FC:76:8F:51:14:62:90:7A:41
         Subject   : C=SK, L=Bratislava, O=Disig a.s., CN=CA Disig

Added    SHA1      : 1B:4B:39:61:26:27:6B:64:91:A2:68:6D:D7:02:43:21:2D:1F:1D:96
         Subject   : C=TR, L=Gebze - Kocaeli, O=T\xC3\xBCrkiye Bilimsel ve Teknolojik Ara\xC5\x9Ft\xC4\xB1rma Kurumu - T\xC3\x9CB\xC4\xB0TAK, OU=Ulusal Elektronik ve Kriptoloji Ara\xC5\x9Ft\xC4\xB1rma Enstit\xC3\xBCs\xC3\xBC - UEKAE, OU=Kamu Sertifikasyon Merkezi, CN=T\xC3\x9CB\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xC4\xB1c\xC4\xB1s\xC4\xB1 - S\xC3\xBCr\xC3\xBCm 3

Added    SHA1      : 78:6A:74:AC:76:AB:14:7F:9C:6A:30:50:BA:9E:A8:7E:FE:9A:CE:3C
         Subject   : C=EU, L=Madrid (see current address at www.camerfirma.com/address)/serialNumber=A82743287, O=AC Camerfirma S.A., CN=Chambers of Commerce Root - 2008

Added    SHA1      : A0:A1:AB:90:C9:FC:84:7B:3B:12:61:E8:97:7D:5F:D3:22:61:D3:CC
         Subject   : C=NO, O=Buypass AS-983163327, CN=Buypass Class 2 CA 1

Added    SHA1      : F9:B5:B6:32:45:5F:9C:BE:EC:57:5F:80:DC:E9:6E:2C:C7:B2:78:B7
         Subject   : C=US, O=AffirmTrust, CN=AffirmTrust Commercial

Added    SHA1      : 29:36:21:02:8B:20:ED:02:F5:66:C5:32:D1:D6:ED:90:9F:45:00:2F
         Subject   : C=US, O=AffirmTrust, CN=AffirmTrust Networking

Added    SHA1      : D8:A6:33:2C:E0:03:6F:B1:85:F6:63:4F:7D:6A:06:65:26:32:28:27
         Subject   : C=US, O=AffirmTrust, CN=AffirmTrust Premium

Bug: 3469985
Change-Id: I963e790cbc042bb19a2ef41858526e823cd6b0ba

Change-Id: I898f34cb7bdddeba189d8380ca593c50713cdc76

Change-Id: I2c9f95a27ee3881fc609e3e4f1468205c701215d

Change-Id: I89243efdeebe22543c45a2166b634f40c3e78cf8

Also remove some duplication and improve some documentation.

Bug: 3484927
Change-Id: I16d673e54ecdc79b77c3f317666519923d11ebe8

* commit '50482651':
  Work around icu4c's excessive file system activity.

Summary:
- rewrote CollectAllTests to not depend on now deleted AllTests
- flattened core-tests into one static jar (enh)
- used static lib in cts build process

Details:

build

    allow static libraries to contain resources
    used by core-tests module
	core/java_library.mk

    collapse CTS_CORE_CASE_LIST to android.core.tests.libcore
    change generate-core-test-description to take a jar of tests to run instead of an AllTests class name
    move common options from callers of generate-core-test-description to its definition
    updated classpath for running generate-core-test-description for libcore tests
	core/tasks/cts.mk

cts

    Restore temporarily disabled cts build
	tests/core/Android.mk

    Updated BUILD_CTSCORE_PACKAGE
    - don't overwrite LOCAL_STATIC_JAVA_LIBRARIES, just append to it so we can use a static library to build android.core.tests.libcore
    - clarify some comments
    - change some @ to $(hide) to clarify operations in showcommands
    - update rules now that input is a static library
	tests/core/ctscore.mk

    New android.core.tests.libcore built from static core-tests library
    Note dummy file is necessary for build to process static library into an APK.
    I first tried to change build to allow a package with only a static library
    but it would require changing how static libraries are packed in to APK,
    which right now is done at the time Java sources are compiled.
	tests/core/libcore/Android.mk
	tests/core/libcore/AndroidManifest.xml
	tests/core/libcore/src/Dummy.java

    Removing old core-tests packages
	tests/core/dom/Android.mk
	tests/core/dom/AndroidManifest.xml
	tests/core/luni-io/Android.mk
	tests/core/luni-io/AndroidManifest.xml
	tests/core/luni-lang/Android.mk
	tests/core/luni-lang/AndroidManifest.xml
	tests/core/luni-net/Android.mk
	tests/core/luni-net/AndroidManifest.xml
	tests/core/luni-util/Android.mk
	tests/core/luni-util/AndroidManifest.xml
	tests/core/xml/Android.mk
	tests/core/xml/AndroidManifest.xml

     Rewrite of logic in CollectAllTests for finding tests to run.
     Previously it acted as a JUnit TestRunner for a specific TestSuite,
     with the runner modified to do no-op runs just to collect the names of tests.
     Now it takes a jar file argument and walks the entries looking for TestCase
     classes and then walking the methods to find the tests.

	tools/utils/CollectAllTests.java

libcore

    fix all-test-java-files-under to work like all-main-java-files-under (to support multiple directories)
    flatten separate core-tests-* into core-tests
    make core-tests a static Java library, avoiding dex overhead (which will only now be done when building CTS packages)
    remove old RI core-tests.jar build which seems obsolete given our use of vogar
    removd core-tests-supportlib since core-tests can now be used in its place

	JavaLibrary.mk

frameworks/base

    Change tracking move from core-tests-supportlib to core-tests

	core/tests/coretests/Android.mk

Change-Id: Id5d965dd96d257544ce27a1e0fcde65901e9c573

There's still a lot of redundant work going on, but this suppresses much of it
for very little effort. The cost of getting all the zone strings for en_US goes
down from 1540ms to 1005ms on stingray.

Bug: 3443476
Change-Id: Ibc425988fd75012236d5f6778cd9edbbe93bca12

* commit '0e96fae1':
  Cope with ICU reporting obsolete language codes.

* commit 'dfbb725f':
  Cope with ICU reporting obsolete language codes.

Change-Id: Ie61022069e597d9c5c6e7ea4659fd614efe31852

* commit '95187055':
  Fix a broken @link in the SecureRandom documentation.

Bug: 3484927
Change-Id: Id9cc9ab6dd37b2191f9a31d4a82e1316c0eee171

Bug: 3484927
Change-Id: I1e1ddf9ea84144d737f4c419f37f9854671d267f

* commit '20998b10':
  Cope with ICU reporting obsolete language codes.

Change-Id: I5f559a4ab69e2582c1fdbbd75a8ac210bcd7c659

java.util.Locale mangles the new language codes for Hebrew and Indonesian into
the obsolete codes. I've added the ICU aliases so that ICU knows about the
obsolete codes (so that when we pass a mangled locale to ICU, ICU knows what
we're talking about). This patch adds tests, and also filters out the
duplicates caused by ICU now reporting both "he" and "iw", which we mangle
into "iw" and "iw". I've used a LinkedHashMap to preserve ICU's ordering;
there's no _need_ to do this, but it's nice behavior, better than the RI's.

Bug: 3452611
Change-Id: I6c6f3058902d5b7ee2f100605c019669da6893cd