Commit graph

823 commits

Author SHA1 Message Date
Paul Duffin
92d41de8f2 Fail check-boot-jars if boot jar contains 0 .class files
Protect against an invalid boot jar, e.g. one containing .dex files is
used instead of .class files.

Test: add a prebuilt for framework-tethering
      Run `m check-boot-jars` with the first fix from
	  https://r.android.com/1341756 and the build fails due to no
	  .class files because a dex jar is used.
	  Run `m check-boot-jars` with all fixeds from
	  https://r.android.com/1341756 and the build works.
Bug: 158304459
Bug: 159112414
Change-Id: I0e8ebd318312949bc58ba7a5c89f9e265b8bedf2
2020-06-17 17:38:24 +01:00
Colin Cross
a1383d8f9d Use inclusive language in build/make
Bug: 158889297
Test: m checkbuild
Change-Id: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
Merged-In: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
(cherry picked from commit c3ad80467e)
2020-06-12 21:10:55 -07:00
Dan Willemsen
91afa94150 base_rules.mk optimizations
A few more misc improvements that I found while analyzing the
performance of base_rules.mk.

This brings an aosp-master/aosp_crosshatch-userdebug kati run from 33.3s
to 28.6s

Bug: 158488548
Test: build-aosp_crosshatch.ninja is the same before/after
Change-Id: If99c31cc7b5d7133d70eb644c6095f19060b71e5
Merged-In: If99c31cc7b5d7133d70eb644c6095f19060b71e5
(cherry picked from commit 8447b8116a)
2020-06-10 17:18:20 -07:00
Julien Desprez
7859593560 Add tradefed-test-framework to the suites exported jar
New jar that needs to be packaged for suites.

Test: make cts
Bug: 149758913
Bug: 156482663
Merged-In: If29508f3dd30939be603ed03f2536c960ca40d92
Change-Id: If50a1e76ffdb4651bf004b26eb111e113569c6c4
2020-06-05 23:08:17 +00:00
Dan Shi
a1082fb046 Revert "Add vts related artifacts to vts-core package"
This reverts commit 5e06288e7c.

Bug: 149249068
Test: build

Change-Id: I8245f1b7a4a74e133c0b7958e0f2908e4e8efd05
Merged-In: I8245f1b7a4a74e133c0b7958e0f2908e4e8efd05
2020-05-19 13:24:59 -07:00
Jiyong Park
7d40b59c4d Reland "mark platform un-availability""
This reverts commit 6e1fa4452b.

Reason for revert: relanding a reverted changed

Bug: 153073816
Test: m

Exempt-From-Owner-Approval: cherry-pick from AOSP

Merged-In: I3735866776cf6eb0320c9fb8c6be8ac0c48baa1c
(cherry picked from commit 403c255b6f)
Change-Id: I3735866776cf6eb0320c9fb8c6be8ac0c48baa1c
2020-05-06 21:42:25 +09:00
Bo Hu
4d6f4f6c9e emulator: enable vendor boot image
BUG: 149826779
Test: Build x86, x86_64, armv7 and arm64
make sure x86/64 boot to home screen;
armv7/arm64 can pass disk mounting stage

Change-Id: I258b69bd0cdc4fb0a99b1a04567051e8d32c389a
Merged-In: I258b69bd0cdc4fb0a99b1a04567051e8d32c389a
2020-05-01 20:01:40 +00:00
Dan Shi
737711d9dc [VTS] copy ltp and kselftest to testcase folder
Bug: 154446791
Test: m -j vts_kernel_tests vts
Change-Id: I405c227293085d3fd0603e9eba5ce276d7dc14d5
Merged-In: I405c227293085d3fd0603e9eba5ce276d7dc14d5
2020-04-27 21:31:55 +00:00
Treehugger Robot
5d979e29cf Remove phony target vts-core
The target has been removed from all builders.

Bug: 151896491
Test: none
Change-Id: I5d1b1058b18153c9cedb33b151dec8daab3e2e57
Merged-In: I5d1b1058b18153c9cedb33b151dec8daab3e2e57
2020-04-24 21:52:47 +00:00
TreeHugger Robot
032c967caf Merge "Copy shared libraries used by tests in device-tests_host_shared-libs.zip." into rvc-dev 2020-04-20 00:28:06 +00:00
easoncylee
dde942ca88 Copy shared libraries used by tests in device-tests_host_shared-libs.zip.
This change collects the shared libraries files used by tests in
device-tests_host_shared-libs.zip. Then the host test can be run in
TradeFed host based on build artifacts.

Bug: 151172861
Test: m -j device-tests
Change-Id: Iac7cfe1310f2c63ace42272d41a54a032bc102bc
Merged-In: Iac7cfe1310f2c63ace42272d41a54a032bc102bc
2020-04-17 08:18:12 +08:00
Dan Shi
5e7b3f429d Include shared host liraries in test suite zip
Bug: 151194160
Test: m -j vts && \
  ls out/host/linux-x86/vts/android-vts/testcases/lib64/
Change-Id: I7ebc4bf392d4c0f27478607846974631390097f8
Merged-In: I7ebc4bf392d4c0f27478607846974631390097f8
2020-04-15 06:24:49 +00:00
Dan Shi
ff8a41c476 Rename vts-core to vts
Bug: 151896491
Test: local build
Change-Id: I17dc5cfeb0d47618201c58af0c9bdb1b7d0a1421
Merged-In: I17dc5cfeb0d47618201c58af0c9bdb1b7d0a1421
2020-04-06 20:28:31 +00:00
Dan Shi
60e8ff4d0d Merge "Rename VTS to VTS10" am: 916be61b91 am: ed51dee98e am: 474ebdd3e9 am: 371d7b5194
Bug: 151896491
Test: none

Change-Id: I6fc0004682299ac14d9d4f0e898eb9326812061f
Merged-In: I4ac161769068887e7575bb1f51a186a4efbe51d6
Merged-In: I6fc0004682299ac14d9d4f0e898eb9326812061f
(cherry picked from commit e8d9f8cd06)
2020-03-31 23:20:06 +00:00
Automerger Merge Worker
5468683063 Merge changes from topic "vts-package" am: ab39096ee7 am: 3e052fc8e1 am: e74a22498c
Change-Id: I8a5edb9b725d9931a635d32f6ff58e632115f9e7
2020-02-19 22:45:06 +00:00
Automerger Merge Worker
9707307409 Change vts-core package to generic *ts package rule am: 4e143cdc85 am: ce62eaaabe am: 150e1c3511
Change-Id: Id09c4d3d0c1843574922819ca59ee91d741f624e
2020-02-19 22:45:03 +00:00
Dan Shi
5e06288e7c Add vts related artifacts to vts-core package
Bug: 149249068
Test: m -j vts-core
vts-core-tradefed run singleCommand vts-core -m VtsKernelLtp

Change-Id: I7fc25f83985bdf7bb34b29f7b28510ef0ade8e4b
2020-02-19 10:44:24 -08:00
Dan Shi
4e143cdc85 Change vts-core package to generic *ts package rule
The current package logic is based on general-tests and device-tests,
which have special rules to package test artifacts in a diffrent way.
vts-core suite should follow the generic *ts package rule.

Bug: 149249068
Test: m -j vts-core && vts-core-tradefed
run some vts-core test

Change-Id: Ib6ab7eb0fb4b8c898a0b3617d10be04dc98c2daa
2020-02-18 13:38:38 -08:00
Ulya Trafimovich
36101543e9 Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint.
This is to unify boot jars with system server jars:
PRODUCT_SYSTEM_SERVER_JARS and PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
do not overlap.

Test: aosp_walleye-userdebug boots

Exempt-From-Owner-Approval: cherry-pick.
Bug: 146363577
Change-Id: Ief8994cc34cb6f7951051313dd66a1334a3a73b4
Merged-In: Ief8994cc34cb6f7951051313dd66a1334a3a73b4
(cherry picked from commit 19ed3a0db7)
2020-02-13 13:36:11 +00:00
Ulyana Trafimovich
6780e0aaa1 Merge "Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint." 2020-02-13 10:53:13 +00:00
Ulya Trafimovich
19ed3a0db7 Make PRODUCT_BOOT_JARS and PRODUCT_UPDATABLE_BOOT_JARS disjoint.
This is to unify boot jars with system server jars:
PRODUCT_SYSTEM_SERVER_JARS and PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
do not overlap.

Test: walleye-userdebug boots

Bug: 146363577
Change-Id: Ief8994cc34cb6f7951051313dd66a1334a3a73b4
2020-02-12 16:16:55 +00:00
Automerger Merge Worker
e0f40d1537 Merge "Implement vendor snapshot" am: 7decc032c2 am: 823e8030a8 am: 3e45e5f4d9
Change-Id: I996ca4a6c5f21c82eb375000f26c5834aa95f7b2
2020-02-11 00:27:28 +00:00
Dan Willemsen
277972a503 Default package-modules to strict module checks
Every warning has been fixed on master now.

Test: multiproduct_kati (build_test through treehugger)
Change-Id: I5bbbb3bd330422f976cb13d9078c5e192f135dc4
2020-01-30 11:03:12 -08:00
Inseob Kim
c465e20400 Implement vendor snapshot
Vendor snapshot can be captured with "m dist vendor-snapshot". With
vendor snapshot and vndk snapshot, older version of /vendor and newer
version of /system will be able to be built together by setting
BOARD_VNDK_VERSION to past vendor's version.

Only vendor modules under AOSP are to be captured. In detail, modules
under following directories are ignored:
- cts/
- device/
- external/clang/
- external/llvm/
- hardware/, except for:
    - interfaces/, libhardware/, libhardware_legacy/, ril/
- vendor/

Bug: 65377115
Test: m dist vendor-snapshot
Change-Id: Ib5859e409f8ab281ca137cae21e9ea08abd8a0b1
2020-01-23 21:51:08 +09:00
Automerger Merge Worker
9957c9bd22 Merge "Track addition of internal classes derived from OpenJDK 9+181." am: 48b67473c6 am: 664375d166 am: b5e0fb030a
Change-Id: I6e026a9e5cee48df98dec479de4d6a04e0e29e20
2020-01-17 22:15:26 +00:00
Treehugger Robot
48b67473c6 Merge "Track addition of internal classes derived from OpenJDK 9+181." 2020-01-17 16:41:48 +00:00
Tobias Thierer
c6cb1c3815 Track addition of internal classes derived from OpenJDK 9+181.
Bug: 147483640
Test: Treehugger

Change-Id: Ib934f0fe4e2aeadcc83bbae3c2efaf45a38081d4
2020-01-17 14:40:22 +00:00
Automerger Merge Worker
c6e9f75834 Merge "Add strict module check to package-modules.mk" am: 951ae30d56 am: a9d2208cb1 am: bc491a64a3
Change-Id: I3b5f49f2dfd2d7078a757d1a4c4fd743c00b3128
2020-01-17 00:31:00 +00:00
Dan Willemsen
09c11073ac Add strict module check to package-modules.mk
The test lists keep getting out of date. Add a per-caller option so that
once they're clean on all builds we can stop them from regressing.

Test: add my_modules_strict := {true,false,,foo} to user
Change-Id: I3e09a8cbe5a07bbbff042b26cea7041c331dde96
2020-01-15 20:54:13 -08:00
Chen Xu
b319487f06 move telephony-framework from framework.jar
add telephony-framework to boot class path

Bug: 140908357
Test: Build
Change-Id: I7ebec46ca8c3b02c76b7f9db51b5dbaea21eff6c
2020-01-15 11:30:47 -08:00
Jiyong Park
7434764cce Merge "Correctly gather boot jars from APEXes" 2020-01-13 01:16:16 +00:00
Automerger Merge Worker
713c5dca91 Merge "Disallow unnamed package on the bootclasspath." am: 56772d7213 am: 270568dce5 am: 4e58211e92
Change-Id: Ic147e01739cfb7e065722d00f8141845dda64cbd
2020-01-11 17:23:22 +00:00
Tobias Thierer
af482ea053 Disallow unnamed package on the bootclasspath.
There are currently no classes on the bootclasspath that live in the
unnamed package (empty package name). This CL explicitly forbids it.
This has the side effect of guarding against some classes of bugs,
for example R8 has functionality to generate some helper classes in
the unnamed package that should not be on the to bootclasspath
because they would hide corresponding classes in Applications.

Strictly speaking I believe that the "not package_name or " part
of the condition in the touched script is not needed because
LoadWhitelist() already skips empty lines and doesn't add "^$" to
the whitelist regex, but relying on this seems very fragile. If
there ever is a need to have classes in the bootclasspath's
unnamed package in future then we can always change this again.

Bug: 147480264
Test: Treehugger

Change-Id: Ic310dd0779dde133b3a5c3039ea5b70d31331a9b
2020-01-11 16:07:13 +00:00
Jiyong Park
ee75813162 Correctly gather boot jars from APEXes
Jars in APEXes have Make module names <jar_name>.<apex_name>. e.g.
updatable-apex.com.android.media. Previously, we have used <jar_name>
which actually meant the platform variant of the jar. This is not only
incorrect, but also is causing problem as the platform variant is no
longer available when the jar is configured to be available only for the
corresponding APEX (via the apex_available property).

Fixing the problem by correctly using <jar_name>.<apex_name> scheme.

Bug: N/A
Test: m

Change-Id: I6e255ce88c9bd80120b29197fb2637a64010f531
Merged-In: I6e255ce88c9bd80120b29197fb2637a64010f531
2020-01-10 15:15:47 +00:00
Jiyong Park
bb0ec8c508 Correctly gather boot jars from APEXes
Jars in APEXes have Make module names <jar_name>.<apex_name>. e.g.
updatable-apex.com.android.media. Previously, we have used <jar_name>
which actually meant the platform variant of the jar. This is not only
incorrect, but also is causing problem as the platform variant is no
longer available when the jar is configured to be available only for the
corresponding APEX (via the apex_available property).

Fixing the problem by correctly using <jar_name>.<apex_name> scheme.

Bug: N/A
Test: m

Change-Id: I6e255ce88c9bd80120b29197fb2637a64010f531
2020-01-07 16:19:44 +09:00
Automerger Merge Worker
51444189eb Merge "Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR" am: 812e606ac8 am: 7c6720bf5d am: 21560ef9d5
Change-Id: Ic343eb0191df23e11e0db8d55169ee437ea39276
2019-12-19 09:38:44 +00:00
Jiyong Park
54aec677da Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR
Reason for revert: relanding with fix
Reverted Changes:
Ic4119368c:Revert submission 1191937-art_apex_available
Ia084976bb:Revert submission 1191937-art_apex_available
Iada86226d:Revert submission 1191937-art_apex_available
Ic76735eac:Revert submission 1191937-art_apex_available
I1eb30e355:Revert submission 1191937-art_apex_available
Icaf95d260:Revert submission 1191937-art_apex_available
Ie8bace4be:Revert submission 1191937-art_apex_available
I8961702cf:Revert submission 1191937-art_apex_available
I39316f9ef:Revert submission 1191937-art_apex_available
I522a7e83b:Revert submission 1191937-art_apex_available
I8b9424976:Revert submission 1191937-art_apex_available
I48b998629:Revert submission 1191937-art_apex_available

Change-Id: Ie2314d1f4cb2b92f005dfc77fcfd7ebace88e48f
2019-12-19 12:35:29 +09:00
Automerger Merge Worker
be2cfd9a21 Revert submission 1191937-art_apex_available am: 9bc1c0032c am: 86af17a5f2 am: 8bdad16235
Change-Id: I75d0921060712f5f9c62f4cca33491c477e5be5d
2019-12-19 02:00:30 +00:00
Joseph Murphy
9bc1c0032c Revert submission 1191937-art_apex_available
Original Commit Message:
"""
Rename modules that are APEX-only

The renamed modules are only available for APEXes, but not for the
platform. Use the <module_name>.<apex_name> syntax to correctly install
the APEX variant of the modules.
"""

Reason for revert: Build Cop - Breaks about 15 AOSP targets, with high confidence due to these changes being the only non-robot changes in those builds.

Reverted Changes:
I190ce2d10:Use apex_available property
I990e0a67e:Use apex_available property
I0d1295683:Revert "Avoid duplicated classes for boot dex jars...
I5fb725403:Find the jar libraries in APEX from the correct pa...
I322b1efcc:Rename modules that are APEX-only
Ifa2bd0f8f:Use apex_available property
Iac6533177:Use apex_available property
Ie999602c6:Use apex_available property
I2a3d73397:Use apex_available property
Ic91bcbb9a:Use apex_available property
Ia6c324eed:Use apex_available property
I964d0125c:Use apex_available property

Change-Id: I39316f9ef2b0cd6c0a347f6b51d011748d0681aa
2019-12-19 01:06:36 +00:00
Automerger Merge Worker
1fd36bc5e4 Merge changes from topic "art_apex_available" am: e09efa6473 am: 750862ab53 am: 628aedb95f
Change-Id: Ie354472c15c37e7d363b3d5779d42105b143804f
2019-12-19 00:59:00 +00:00
Jiyong Park
439b829b42 Find the jar libraries in APEX from the correct path
JAR libraries in the ART and conscrypt APEXes are no longer built for
the platform. Therefore, the path out/target/common/<name>_intermediates
does not exist. Instead use the path
out/target/common/<libname>.<apexname>_intermediates paths for those
APEX-only jars.

Bug: 128708192
Bug: 133140750
Test: m

Change-Id: I5fb725403ac22198e5ce6d77ca97c5f3392fabfd
2019-12-17 21:16:34 +09:00
Ian Kasprzak
737c02b59a Merge "Include all system images in -with-license.sh" am: c99726bcf0 am: 9633038e48
am: b836080120

Change-Id: I2e8fd98e17cfa6fb6a55bb445197685982486fad
2019-12-06 09:31:05 -08:00
Ian Kasprzak
8f9b3c196c Include all system images in -with-license.sh
Rename artifact to not use -img- which conflicts w/ TF
test filters.

Bug: 125451157
Test: Verified phone flash works with new with-license artifact.
Change-Id: I7dd4eb17a24f1bf36926a83939f69681ff8b26ad
2019-12-05 15:51:24 -08:00
Dan Shi
0820c97eec Merge "Add vts-core-tradefed.jar to general-tests.zip" am: 06c957dde2 am: f9fd7aa810
am: aea6abf963

Change-Id: I32c906e55306fde6172ca6f0715f7361223bbb07
2019-11-29 21:00:38 -08:00
Dan Shi
bafb1d7289 Add vts-core-tradefed.jar to general-tests.zip
This is needed for vts-core tests require vts specific preparers.

Bug: 142972256
Test: m -j general-tests
Change-Id: Ic2def11ac5f57a923d2bcefe6683e9a5fa66e7c6
2019-11-23 12:16:11 -08:00
Ian Kasprzak
7bdcc5a840 Merge "Switch from VENDOR_BLOBS_NOTICE to VENDOR_BLOBS_LICENSE." am: 9651113f02 am: 92b51b4e8d
am: 387dcfc414

Change-Id: I6da7a665774919ea49637481d71c6426c846ac36
2019-11-12 21:58:20 -08:00
Ian Kasprzak
4305cf2797 Switch from VENDOR_BLOBS_NOTICE to VENDOR_BLOBS_LICENSE.
Update of build variable to VENDOR_BLOBS_LICENSE
will be done via update to vendor-blob generation scripts.

Bug: 125451157
Test: Verified output in out and dist folders (with local rename).
Change-Id: I94190f0ef95a58464dceca912f8759023095fc7d
2019-11-12 18:45:44 -08:00
Ian Kasprzak
0f676f4e5a Merge "Add "with-license" rule to generate public AOSP phone image." am: 44b20aca98 am: 9a5a603b33
am: b7ef598a6f

Change-Id: I70fdcb78a1bad967d2ba42c012499f112b98c0a6
2019-11-11 10:09:47 -08:00
Ian Kasprzak
9601e6e0f8 Add "with-license" rule to generate public AOSP phone image.
Bug: 125451157
Test: Verified output in out and dist folders

Additional verification:
- Without the VENDOR_BLOBS_NOTICE build fails
- Output shell artifact displays license as expected
- Shell artifact permissions are correct (ug executable)
- Shell artifact unzips inner zip after license agreement
- Unzipping shell artifact only unzips license.txt file

Change-Id: If1004bd61d873c592c8541a13724eb575f59cddf
2019-11-09 14:21:45 -08:00
Inseob Kim
6442896aa9 Merge "Fix and generate vndk snapshot entirely in Soong" am: db49de8560 am: 8817894034
am: c56a94bd7f

Change-Id: I06d35f71cbc36b7e773eb0110efd327fe562c648
2019-11-05 10:43:46 -08:00