Commit Graph

955 Commits

Author SHA1 Message Date
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
Treehugger Robot
db49de8560 Merge "Fix and generate vndk snapshot entirely in Soong" 2019-11-05 03:48:51 +00:00
Inseob Kim
65c91ff15a Fix and generate vndk snapshot entirely in Soong
- VNDK snapshot now respects stem and suffix.
- ld.config.txt is removed from snapshot as linkerconfig has become default.
- Soong builds entire snapshot, and make just calls dist-for-goals.

Bug: 142589718
Test: build and install snapshot
Test: development/vndk/snapshot/update.py with past version of snapshot
Change-Id: Ib99f1006d3553b1871b86ab168b1706fe47e1afb
2019-10-23 15:54:08 +09:00
karenluo
af68e408ec Add App Compatibility Test Suite (C-Suite) to build
Test: make csuite
Change-Id: Id2a9c0acffef35e092485f598203fe335a24810c
2019-10-04 17:51:16 +00:00
Jooyung Han
ff6182497e Merge "cleanup: remove unused variable"
am: 90c7163e7e

Change-Id: Ibabf6ca0cd7ca8d7f3ff48cc3979dae240568176
2019-09-26 09:59:29 -07:00
Jooyung Han
f251232bb1 cleanup: remove unused variable
removing an unused variable: vndk_snapshot_configs_out in
core/tasks/vndk.mk

Test: m vndk
Change-Id: I2dc76ec7e41c8b1e818ecd056526a8c61a18da92
2019-09-25 10:33:58 +09:00
Dan Shi
516a6158c8 Merge "Create a vts-core suite harness package"
am: d9bef81f7c

Change-Id: I6f393746adbe01ca5856142aba2557264172cb52
2019-09-20 11:22:14 -07:00
Dan Shi
796ff4ffb5 Create a vts-core suite harness package
vts-core.zip will include all vts-core tests and suite harness
(vts-core-tradefed).

Bug: 141012181
Test: m -j vts-core

Change-Id: Ib13a2bffb4dc9619d2732d65729ecb0246a0b9a0
2019-09-19 13:13:44 -07:00
Xin Li
abf6afdce6 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: Ib7d2f7c5a8aef5c6c3e8f74c6c32d5092f32a166
Merged-In: I6f788cb4c7328e4f2315e4f028e2dd53badeb6cd
2019-09-08 13:11:47 -07:00
Julien Desprez
c264c32770 Merge "Delete cts_instant tasks: not needed anymore"
am: 979c9f3117

Change-Id: I83be1baa082283cb85172aa728ccb4a3f566f8f1
2019-09-04 12:04:12 -07:00
Julien Desprez
7c519defbd Delete cts_instant tasks: not needed anymore
Cts-instant is now run directly from cts so there is no
need for a dedicated (unmaintained) cts-instant target.

Test: None
Bug: 139302375
Change-Id: Ibac30f182028981cc7ad55b3998fbf6a545f62f1
2019-09-03 14:43:41 -07:00
Peter Collingbourne
074651ba13 Merge "Only include the "tools" and "testcases" subdirectories in android-cts.zip."
am: 0f9ac40dd6

Change-Id: Iccd2f3cbcad562a0fa7a089cb48f10db1ace7177
2019-08-21 17:24:25 -07:00
Peter Collingbourne
bbddfcf7ba Only include the "tools" and "testcases" subdirectories in android-cts.zip.
Without this, we can end up packaging log files from previous CTS runs in
the zip file. If the names of those log files contain whitespace characters,
it can result in a build failure.

Change-Id: Id96d1915a03b6a715acfdc212c9b2d6f28045baa
2019-08-21 12:31:41 -07:00
nelsonli
5530deacd9 Merge "VTS: Add vts-core to the dependency of tests" am: 1413925ac4
am: 7dc1cbe13c

Change-Id: I1963cfc0f1bcf56d1e86c4c91fec1ed7ee9eec59
2019-08-15 19:00:23 -07:00
nelsonli
7dc1cbe13c Merge "VTS: Add vts-core to the dependency of tests"
am: 1413925ac4

Change-Id: I6a2dd9858e0a9c30d1d08b0815c5fbc54e568c5c
2019-08-15 18:48:35 -07:00
nelsonli
e7b71a18a4 VTS: Add vts-core to the dependency of tests
Bug: 137921421
Test: (1) m tests
      (2) check vts-core-tests.zip

For migrating most existing VTS test to executable by Base TradeFed, we have to
create vts-core suite and test all of the modules in vts-core first.
And add the packaging rules for vts-core suite.

Bug: 137921421
Change-Id: Ifc92db205c78db98abf704aa6dfa50f1f77e983d
2019-08-14 09:47:21 +08:00
Inseob Kim
0f7c44018d Merge "Include headers and props to VNDK snapshot" am: 3ca61ad9d9
am: 731737b92d

Change-Id: I0d35b90a15c1f1e5c1d6b096eb31a14348e791ad
2019-08-11 16:31:08 -07:00
Inseob Kim
731737b92d Merge "Include headers and props to VNDK snapshot"
am: 3ca61ad9d9

Change-Id: Ibb2d23dfb79350fed1351020144e3a538d6ab160
2019-08-11 16:21:09 -07:00
Inseob Kim
316f77ba3c Include headers and props to VNDK snapshot
For all vndk snapshot libraries, header files exported by the libraries
will be included to the snapshot. Android.bp will contain necessary
information to link against/install vndk snapshot libraires:
export_include_dirs, export_system_include_dirs, export_flags, and
relative_install_path.

Bug: 132818174
Test: 1) VNDK_SNAPSHOT_BUILD_ARTIFACTS=true \
           development/vndk/snapshot/build.sh
Test: 2) development/vndk/snasphot/update.py
Test: 3) see contents of Android.bp and include directories
Change-Id: I3ed179b613ca51f7854dc819783a962a56b973eb
2019-08-08 18:46:31 +09:00