Commit Graph

940 Commits

Author SHA1 Message Date
Joe Onorato
9aa0b89177 make protobuf available to CTS host tools
Test: make -j32 cts
Change-Id: I866aebd6313fe2b0b6d3a1876ac8e5ada473a7b0
2016-12-20 22:28:54 -08:00
Vikram Dattu
29e88b850e HOST_OUT_EXECUTABLES path is not needed in misc_info file
HOST_OUT_EXECUTABLES is already added to the PATH variable,
so it is not needed to add the path info for binaries in
misc_info.txt and <partition>_image_info.txt.

Earlier the mkuserimg item in the build_image dictionary is
hardcoded to "mkuserimg.sh", but now it is customized for
mkuserimg.sh and mkuserimg_mke2fs.sh, and maintained in
dictionary "ext_mkuserimg=$(MKEXTUSERIMG)" in misc_info.txt
and <partition>_image_info.txt, where it is used in the
build_image script while creating the images.

The problem here is the value for this key is set to build
path of the file mkuserimg file
$(HOST_OUT_EXECUTABLES)/mkuserimg.sh,
i.e. out/host/linux_x86/bin/mkuserimg.sh,
there by standalone signing the images using otatools is
not working as the executables are packed in bin folder.

Test: tools/releasetools/sign_target_files_apks
    -p <extracted ota-tools.zip folder>
    --extra_signapk_args=-f /etc/opt/cert_data.dat
    -v
    --replace_verity_private_key ~/build/target/product/security/verity
    --replace_verity_public_key ~/build/target/product/security/verity.x509.pem
    -k <key maping>
    <input target files zip>
    <output target files zip>

Change-Id: I57af1025ec38f3794f779c49faa0bf965afc6a5d
2016-12-20 13:55:06 +01:00
Paul Duffin
1d0355691e Merge "Use legacy-test instead of core-junit" am: e28eb9ff0e am: 34e4a7b7fd am: 2c373fbeb4
am: 4ba342a74f

Change-Id: I33d0c68c8a6725b5bcf381f35865dbae19448ea5
2016-12-13 10:04:27 +00:00
Paul Duffin
5bf0587461 Use legacy-test instead of core-junit
The core-junit library has been replaced with the legacy-test
library. The latter included everything that was in core-junit
plus some android.test classes that were in frameworks.

Bug: 30188076
Test: make checkbuild
Change-Id: Id2ba827705dbd2c27a1183e1153b03c11a8a4074
2016-12-09 15:21:45 +00:00
bowgotsai
6dd1058761 Merge "custom_image: fix build break" am: 52897d4ecb am: ab0ae8e728 am: 882fc2c96a
am: 5f58152b73

Change-Id: I0bf4729aa396a1566b555c6fe2e4dfeff31b0e72
2016-12-07 03:38:30 +00:00
Treehugger Robot
52897d4ecb Merge "custom_image: fix build break" 2016-12-07 03:20:13 +00:00
bowgotsai
0f72bca96b custom_image: fix build break
Fix build break caused by
https://android-review.googlesource.com/#/c/305575/.

Bug: 33358681
Test: make custom_images

Change-Id: I1ba7cf61491c8593b20bdac58e984f1928697b8c
2016-12-06 17:36:31 +08:00
Stuart Scott
270faa62e1 Remove tradefed prebuilt dependancy
Test: make cts
Change-Id: I6d75e9e8ca0f4327c0e6e1203d9009359d3819b8
2016-11-22 15:12:35 -08:00
Julien Desprez
63d377c56b Build CTS out of TF source
Export the TF jar build from source to the cts zip.

Test: build cts
Bug: 32819381
Change-Id: I4e1ccbd3a7ea27998a95986c1dd0348e01da60b6
2016-11-11 12:12:06 +00:00
Guang Zhu
bd8ab0da8b Merge "remove use of CTS_TESTCASES_OUT" am: 24dd78a2d7 am: b5e2ecab4d
am: 30858857a0

Change-Id: Ib5f060e87d8319968795e00bf6259d2ec1690629
2016-10-07 01:24:48 +00:00
Guang Zhu
29fe14721e remove use of CTS_TESTCASES_OUT
Bug: 31788743
Test: $ make cts dist
      # check contents of generated package and API coverage
      # report
      $ make checkbuild

Merged-In: Ieec069bafbcc6df5a5b3b06befb4a3a5678a06fd
Change-Id: Ieec069bafbcc6df5a5b3b06befb4a3a5678a06fd
(cherry picked from commit f8f0880b3b8fb6a80ed766068d5f1714625b8960)
2016-10-06 16:57:39 -07:00
Guang Zhu
c67a71a238 remove use of CTS_TESTCASES_OUT
Bug: 31788743
Test: $ make cts dist
      # check contents of generated package and API coverage
      # report
      $ make checkbuild

Change-Id: Ieec069bafbcc6df5a5b3b06befb4a3a5678a06fd
2016-10-06 12:47:33 -07:00
Julien Desprez
7b10950b8a Export the cts tests jar required to run unit tests
Bug: 31393228
Change-Id: Id5ce5beccd70c67be6d4bfed01f7206a48498fc2
2016-09-12 11:19:48 +01:00
Keun Soo Yim
a942dc8433 delete vts.mk (which is moved to test/vts)
Change-Id: I3ab29e59b6f77f3ac92bbfe7a6f7a8f36b2ba3bd
2016-09-02 11:43:43 -07:00
Narayan Kamath
9e57e11256 Merge \\\"Update package whitelist to track changes to java.lang.invoke.\\\" am: 8ce8f60a2f am: dbce967b11
am: 1668db9c69

Change-Id: I09bfa60727e3df47ae2e0bb1f0b936ff229111ae
2016-08-01 12:35:14 +00:00
Narayan Kamath
dbce967b11 Merge \"Update package whitelist to track changes to java.lang.invoke.\"
am: 8ce8f60a2f

Change-Id: I61e7aa74c70675f676638dae867f3f18eebe75b3
2016-08-01 12:29:17 +00:00
Narayan Kamath
7ee6289f25 Update package whitelist to track changes to java.lang.invoke.
The introduction of java.lang.invoke.MethodType and its supporting
classes, in particular.

bug: 30550796
test: make checkbuild

Change-Id: Id2b84d3bb911f4bc5aef0761d357b1e9121030ab
2016-08-01 13:24:14 +01:00
Narayan Kamath
b9cb94135b Merge \\\"Add java.lang.invoke to the package whitelist.\\\" am: 900e9e6392 am: e2d375f12c
am: 99a8527d68

Change-Id: Ia9347cd508917b4ae0c9f3724a835d9af752af79
2016-07-22 09:45:34 +00:00
Narayan Kamath
e2d375f12c Merge \"Add java.lang.invoke to the package whitelist.\"
am: 900e9e6392

Change-Id: I5d25d40dc0b661ff1acaa957145f32c0f13da853
2016-07-22 09:40:35 +00:00
Narayan Kamath
497c35c1a7 Add java.lang.invoke to the package whitelist.
Tracks libcore change that adds the first classes from this package
to core-oj.jar. Note that packages need to be whitelisted even if
the classes in question aren't public API.

Test: make checkbuild docs

Change-Id: I917dc63899124ca30bbeb2902787faea6754bb43
2016-07-21 15:27:09 +01:00
Yi Kong
e07bf4a87f Merge \\\"Add jdk.net to whitelist\\\" am: d2f4cbbf88 am: 09d7992067
am: 3fc2a2c326

Change-Id: I5939b0d36c8366ff2935ede6d295601951714e62
2016-06-29 11:14:30 +00:00
Yi Kong
09d7992067 Merge \"Add jdk.net to whitelist\"
am: d2f4cbbf88

Change-Id: I80f7f529659953fd5664211e2a779d09e2245d34
2016-06-29 11:06:23 +00:00
Yi Kong
d2f4cbbf88 Merge "Add jdk.net to whitelist" 2016-06-29 11:00:47 +00:00
Hung-ying Tyan
c028287fcd Merge \\\"Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES\\\" am: 2acb2d5bcf am: 200da242a5
am: 00e23a1d8f

Change-Id: Ibf7c1fdeb9994b7c12ac3dd2fa8d8dec53b7d276
2016-06-28 06:27:13 +00:00
Hung-ying Tyan
200da242a5 Merge \"Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES\"
am: 2acb2d5bcf

Change-Id: I3c151949bcc6b8d75f2c46619b6ce38561084338
2016-06-28 06:22:17 +00:00
Hung-ying Tyan
3c054d8e1f Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES
Allow exceptions specified by module (VENDOR_EXCEPTION_MODULES) and
path (VENDOR_EXCEPTION_PATHS, not including leading vendor/).

BUG=26968426

Change-Id: I068e43f3eae14f8793c33ae916d46979ab1681d1
2016-06-28 10:10:53 +08:00
Yi Kong
066a9c3e53 Add jdk.net to whitelist
Tracks libcore commit a434f3be3c22c6b3e7ddd426766808e76a5780fd

Bug: 29067535
Change-Id: I764b602aa0f2a991dc26b5fd42a1143bb58d67ba
2016-06-24 18:57:55 +01:00
Vineeta Srivastava
323f0f9407 Whitelist verizon as local module owner.
Change-Id: I807ac61688e6f5862de521e3c9b960dd64eed1f6
2016-06-09 11:12:52 -07:00
Nicholas Sauer
088230cb34 Add org.apache.harmony.tests.javax.xml to old cts
bug: 28556024
Change-Id: I7903ce93f27aef55f55acc9231e631d11a463f1b
2016-05-10 12:54:32 -07:00
Igor Murashkin
5ec15a52b1 old-cts: Add testng and libcoreoj test support
Bug: 27521545
Change-Id: I2a954401ce47604987a437a2741bcab252d32708
2016-04-26 17:47:45 -07:00
Igor Murashkin
2d9bba9735 old-cts: Add testng and libcoreoj test support
Bug: 27521545
Change-Id: I2a954401ce47604987a437a2741bcab252d32707
2016-04-26 17:00:22 -07:00
Narayan Kamath
9a611b27fc Merge "Revert "old-cts: Add testng and libcoreoj test support"" into nyc-dev 2016-04-26 13:22:08 +00:00
Narayan Kamath
51b3f1da0b Revert "old-cts: Add testng and libcoreoj test support"
This reverts commit 1d4ad6a527.

This topic has been reverted because it causes build flakiness and
bogus verification failures on most active changes.

Change-Id: I4a935c9a861e063e28ddc1c35bc3fa015174e81d
2016-04-26 13:14:55 +00:00
Igor Murashkin
1cb8adb1fa Merge "old-cts: Add testng and libcoreoj test support" into nyc-dev 2016-04-25 23:39:16 +00:00
Igor Murashkin
1d4ad6a527 old-cts: Add testng and libcoreoj test support
Bug: 27521545
Change-Id: I2a954401ce47604987a437a2741bcab252d32707
2016-04-07 16:55:08 -07:00
Joe Onorato
48bd6f53f4 Add generation of a module-info.json file
This outputs all of the modules that the build system knows about
for this invocation.

Change-Id: I8f95f3f8443c18f7898ce90e287432cbd2b6db6d
2016-04-06 19:11:51 -07:00
Przemyslaw Szczepaniak
068ff11c05 Add java.util.stream to whitelisted packages
Bug: 27692239
Change-Id: I50e671222efc415fb930e5493f1943c5b8f6a71c
(cherry picked from commit fe606f0939)
2016-03-18 13:05:59 +00:00
Przemyslaw Szczepaniak
fe606f0939 Add java.util.stream to whitelisted packages
Bug: 27692239
Change-Id: I50e671222efc415fb930e5493f1943c5b8f6a71c
2016-03-16 13:45:23 +00:00
Stuart Scott
cc52da8dae Add cts_v2 phony target for temporary build fix.
Change-Id: I770dc800dbcdff2c31e370410b32e2ee079f308b
2016-03-02 08:42:41 -08:00
Stuart Scott
794308f169 Switch to CTSv2
bug:21762834
Change-Id: If91fd4de148241760ff29cbe227864e301a9fca7
2016-02-29 20:47:35 -08:00
Keun Soo Yim
172b7d421e build file change for vts to use the existing cts-tradefed infrastructure
Mostly done by stuartscott@

Change-Id: I016405757f39df833d532bc01fd2237e5e961a8a
2016-02-24 16:12:49 -08:00
Neil Fuller
c155d7d1aa Add new package: java.util.function
Bug: 26814204
(cherry-picked from commit 9429a880a3)

Change-Id: Ibd4f7a985ddcdb7564a79326ce846257882e294f
2016-02-16 11:49:14 +00:00
Neil Fuller
9429a880a3 Add new package: java.util.function
Bug: 26814204
Change-Id: I32afbbc0124bdf4fcec8589e4e42f62051154110
2016-01-28 13:42:38 +00:00
Narayan Kamath
436d0c1117 Update the package whitelist for the boot image.
.. to track the inclusion of OpenJdk.

(cherry picked from commit b3c9e4a22e)

Change-Id: Ie7277a0403dee9ccd114d9dcb7bf95cdaf5688a0
2015-12-24 10:10:55 +00:00
Piotr Jastrzebski
052a00f64e Use core-oj alongside core-libart wherever required.
With some core classes moved to separate core-oj jar
we need to use the new jar.

(cherry picked from commit 89b94c827f)

Change-Id: I025c0adc70535bf23def3ab0ce28a1bfaef72514
2015-12-24 10:10:55 +00:00
Aaron Holden
aee6f602f9 Move suite-level dynamic config to testcases
Enable client-side dynamic config code to access the suite-level dynamic
config files by placing them in the testcases directory. Also update
cts_v2.mk to define the location of its corresponding dynamic config file.

bug:23625592
Change-Id: Id11dea4b6acbe8ea7e5e9579e369a2be5873a224
2015-12-16 12:32:57 -08:00
Michael Wright
0fb087fc73 Add new Test API for CTS testing.
Bug: 25608286
Change-Id: I0334061b548970959e46392dc3a1feed8533548c
2015-11-25 11:38:44 +00:00
Narayan Kamath
b3c9e4a22e Update the package whitelist for the boot image.
.. to track the inclusion of OpenJdk.

Change-Id: I6ec4e4e8653b31b9a72751812c88997b51c31134
2015-11-20 14:35:21 +00:00
Piotr Jastrzebski
89b94c827f Use core-oj alongside core-libart wherever required.
With some core classes moved to separate core-oj jar
we need to use the new jar.

Change-Id: Ie069c7a93e63b1df854b3137d984b96520562609
2015-11-20 13:53:22 +00:00
Ying Wang
16a27b40eb Merge "Don\'t run ziptime on host zip files." am: 7f50cf7f50 am: 3a5c02e295
am: 3932de119a

* commit '3932de119a79ec3ddf5972722a9cb6fb8e4526b1':
  Don't run ziptime on host zip files.
2015-11-04 18:45:19 +00:00