Commit graph

70769 commits

Author SHA1 Message Date
Treehugger Robot
78d09c6177 Merge "Missing required packages for f2fs when building ota package" am: 9d4b9bb50c
Original change: https://android-review.googlesource.com/c/platform/build/+/1730911

Change-Id: I7b0a056986d0a29beb0a7d265f35ee0f5c851f7e
2021-06-09 17:05:13 +00:00
Julien Desprez
6f04506f42 [automerger skipped] [CP] Remove unit tests jar from suites am: 9a6e4270bc -s ours
am skip reason: Merged-In Ie808c7422e35c48c9392f7179806745ef392de64 with SHA-1 67e5ec6202 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14910114

Change-Id: I963b2d70dd3ab85ba6bce6ca2f51d76b6d2e27a6
2021-06-09 17:03:56 +00:00
Jaegeuk Kim
6279b6c511 Merge "Missing required packages for f2fs when building ota package" into sc-dev 2021-06-09 16:50:29 +00:00
Treehugger Robot
9d4b9bb50c Merge "Missing required packages for f2fs when building ota package" 2021-06-09 16:34:41 +00:00
Inseob Kim
2a70ea0dce Remove redundant dependency to API_FINGERPRINT
API_FINGERPRINT is only used from buildinfo.prop.

Bug: 188068953
Test: build
Change-Id: I4804d3e61d0bac83c59c54751209bf47404e3a31
2021-06-09 17:36:08 +09:00
Jaegeuk Kim
1f50a36c62 Missing required packages for f2fs when building ota package
Bug: 171942852
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Ib2ecc0cf88d71f358bd04e6c4ac129607fe4054c
2021-06-08 19:12:15 -07:00
Jaegeuk Kim
01da65f93a Missing required packages for f2fs when building ota package
Bug: 171942852
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Ib2ecc0cf88d71f358bd04e6c4ac129607fe4054c
Merged-In: Ib2ecc0cf88d71f358bd04e6c4ac129607fe4054c
2021-06-09 02:11:23 +00:00
Julien Desprez
9a6e4270bc [CP] Remove unit tests jar from suites
Remove unit tests jar from official suite packaging
they will be run & tested externally as real unit tests.

Include the compatiblity-tradefed.jar element as it will
be needed.

Test: make cts; run cts-unit-tests
Bug: 173811050
Change-Id: Ie808c7422e35c48c9392f7179806745ef392de64
Merged-In: Ie808c7422e35c48c9392f7179806745ef392de64
2021-06-08 18:24:30 -07:00
Chih-Hung Hsieh
e40e2bf8db Add one Asm warning pattern
Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Change-Id: I85b53c15b5a9e705e939e2cf810a0344df6dbeda
2021-06-08 14:52:45 -07:00
satayev
66bb2ab32d Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to default_art_config.mk.
The list of updatable system server jars must be known in
module_common.mk which is used to build mainline modules that contain
said system server jars.

module_common.mk inherit from default_art_config.mk.

Note that we could also move the defition into a separate make file,
if current change causes problems. However, places like clockwork
overwrite values of PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS instead
of appending to them, so it should not be a source of issues.

Bug: 180105615
Bug: 190407034
Test: TARGET_BUILD_VARIANT=user vendor/google/build/build_mainline_modules.sh -j64 and inspecting build artifacts
Change-Id: I771895bf0a974a4c6aa4f7374159c22536f03891
Merged-In: I771895bf0a974a4c6aa4f7374159c22536f03891
2021-06-08 15:40:22 +00:00
Tianjie
a5fca03e0a Amend the apex info for ota package
We have already logged the compressed apexes in the target-files.
Because we want to support the apex metrics during OTA update, also
include the uncompressed apexes in the META/apex_info.pb.

For incremental OTA packages, include the source apex version for
each apex package as well.

Bug: 190244686
Test: unit test
Change-Id: I5cf2647c56c4feb5517f9a81aa1e9abc52515bf1
2021-06-07 20:33:46 -07:00
TreeHugger Robot
3745f76ce1 [automerger skipped] Merge "RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED" into sc-dev am: 1efb38582a -s ours
am skip reason: Merged-In I94e3122372dd20c942b2c858070a6ca797312792 with SHA-1 f93c13d51b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14830651

Change-Id: I3afeaea1c9f55dc0715fd388c34a1aadc1c1d31d
2021-06-07 01:09:54 +00:00
TreeHugger Robot
1efb38582a Merge "RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED" into sc-dev 2021-06-07 00:57:19 +00:00
Kelvin Zhang
19b75cf17b Merge "Handle caremap for partial OTAs" am: f2f564c9e4 am: b0b998ad7f
Original change: https://android-review.googlesource.com/c/platform/build/+/1726771

Change-Id: Ic519a966409d649b9664b4a7c07357d00d87a44a
2021-06-06 23:42:36 +00:00
Kelvin Zhang
b0b998ad7f Merge "Handle caremap for partial OTAs" am: f2f564c9e4
Original change: https://android-review.googlesource.com/c/platform/build/+/1726771

Change-Id: I54b2aa8189c51c1092f017a017f9127b977dd6c3
2021-06-06 23:17:13 +00:00
Kelvin Zhang
f2f564c9e4 Merge "Handle caremap for partial OTAs" 2021-06-06 22:56:49 +00:00
Kelvin Zhang
766eea72ef Handle caremap for partial OTAs
When generating a partial OTA, filter care_map.pb to include only the
partial partitions, then generate OTA.

Test: Generate a partial OTA, make sure care map is included.

Change-Id: I0eaa12772eb1d06a57451e64f70689d3183f0115
2021-06-04 16:17:32 -04:00
Yuntao Xu
411bc5b6ea [automerger skipped] Merge "add LOCAL_DISABLE_TEST_CONFIG logic" into sc-dev am: 8c4997265a -s ours
am skip reason: Merged-In I64372b4ba84fcf1af937abdee345ceb1d3c2f6c5 with SHA-1 32a085c041 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14823788

Change-Id: I5622cbc32c17bbd32c9a1f880337ad09d46873a9
2021-06-04 17:05:37 +00:00
Yuntao Xu
8c4997265a Merge "add LOCAL_DISABLE_TEST_CONFIG logic" into sc-dev 2021-06-04 16:51:28 +00:00
Jeongik Cha
5b1d149586 RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED
In the case of unbundled build, the module in vendor should use
system(_ext) module by prebuilt one. But RRO depends on system module
directly depending on some conditions(packages exporting resources)

In this change,
 1. Temporarily make LOCAL_RES_LIBRARIES empty(For now, auto generated
 RRO doesn't use overlaid package's resources), enable it when prebuilts
 are ready.
 2. According to (1), its SDK_VERSION can be current)

Bug: 187404676
Test: TARGET_BUILD_UNBUNDLED_IMAGE m vendorimage, and check if there is
no build error regarding RRO.

Change-Id: I94e3122372dd20c942b2c858070a6ca797312792
Merged-In: I94e3122372dd20c942b2c858070a6ca797312792
(cherry picked from commit f93c13d51b)
2021-06-04 00:05:55 +00:00
Yuntao Xu
ee58bb67a5 add LOCAL_DISABLE_TEST_CONFIG logic
Disable the generation of .config file when the variable
LOCAL_DISABLE_TEST_CONFIG is true.

Bug: 188927912
Test: rum 'm module-name' (`android_test_helper_app` type module)
Test: TreeHugger
Change-Id: I64372b4ba84fcf1af937abdee345ceb1d3c2f6c5
Merged-In: I64372b4ba84fcf1af937abdee345ceb1d3c2f6c5
2021-06-03 10:22:53 -07:00
Mohammad Samiul Islam
8f401f93eb [automerger skipped] Merge "Revert "Revert "Re-land "Enable apex compression on all devices with updatable apex""" into sc-dev am: 0e06c113f0 -s ours
am skip reason: Merged-In If0ea1168c710eeb4c90d7a9768a278a07adc48fa with SHA-1 2b85e3ace5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14733422

Change-Id: I068639b10fa5ea0a50584af090c2483ac63cb965
2021-06-03 14:21:08 +00:00
Mohammad Samiul Islam
0e06c113f0 Merge "Revert "Revert "Re-land "Enable apex compression on all devices with updatable apex""" into sc-dev 2021-06-03 13:59:28 +00:00
Chih-hung Hsieh
bee47e42d9 Merge "Add new Asm/C++/Java/Make warning patterns" am: 041770b553 am: dee5f7979b
Original change: https://android-review.googlesource.com/c/platform/build/+/1724110

Change-Id: I182fb4b82e0a8a4e1cc4349ebec93c6e4084c2a8
2021-06-02 22:18:30 +00:00
Tianjie Xu
88024c3ff9 [automerger skipped] Merge "Check super size for factory OTA at build time" into sc-dev am: b195f48ce9 -s ours
am skip reason: Merged-In Ia7ba5999d23924a1927e9a9463856a4d0ea90c20 with SHA-1 294ec7d9e5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14736823

Change-Id: I88097d648ab3a30f8e99360c21fff45c410fcebb
2021-06-02 22:09:37 +00:00
Chih-hung Hsieh
dee5f7979b Merge "Add new Asm/C++/Java/Make warning patterns" am: 041770b553
Original change: https://android-review.googlesource.com/c/platform/build/+/1724110

Change-Id: I01334bb1041ef7d395f3c0bd3c93ec9a3a6eded2
2021-06-02 21:56:52 +00:00
Tianjie Xu
b195f48ce9 Merge "Check super size for factory OTA at build time" into sc-dev 2021-06-02 21:53:36 +00:00
Chih-hung Hsieh
041770b553 Merge "Add new Asm/C++/Java/Make warning patterns" 2021-06-02 21:37:04 +00:00
Chih-Hung Hsieh
5d9ee04f56 Add new Asm/C++/Java/Make warning patterns
* Change some incorrectly-classified logtags warnings to C++.
* Fix gpylint warnings of long lines in html_writer.py.

Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Change-Id: I98c01dadfd72b202d81ef7c94e93c42182f6065c
2021-06-02 21:34:49 +00:00
Jeff Sharkey
2ec10e7543 Merge "platform/build/make - S is now 31" into sc-dev am: 83ecfb5073
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14748391

Change-Id: I68f42fbd7ef09dd357d010ac9a27272696414519
2021-06-02 20:14:08 +00:00
Jeff Sharkey
83ecfb5073 Merge "platform/build/make - S is now 31" into sc-dev 2021-06-02 20:11:14 +00:00
Jeff Sharkey
fcc2b97e54 platform/build/make - S is now 31
Bug: 171506470
Test: Build
Change-Id: I1f3475479659855c0185236f88bc388a61844968
2021-06-02 10:19:19 -06:00
Mohammad Islam
598bea3cb0 Merge "Revert "Revert "Re-land "Enable apex compression on all devices with updatable apex""" am: dfa58118a6 am: 6429f827a0
Original change: https://android-review.googlesource.com/c/platform/build/+/1711014

Change-Id: I6950657f908e7ec6f191a10289b5a13502a60d84
2021-06-02 10:54:03 +00:00
Mohammad Islam
6429f827a0 Merge "Revert "Revert "Re-land "Enable apex compression on all devices with updatable apex""" am: dfa58118a6
Original change: https://android-review.googlesource.com/c/platform/build/+/1711014

Change-Id: I5d37024596058c8006dd0bf6d60cf7c007c69afc
2021-06-02 10:29:17 +00:00
Mohammad Islam
dfa58118a6 Merge "Revert "Revert "Re-land "Enable apex compression on all devices with updatable apex""" 2021-06-02 10:01:19 +00:00
Treehugger Robot
6ac14409a7 Merge "RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED" am: a7f8c55374 am: 72bde32481
Original change: https://android-review.googlesource.com/c/platform/build/+/1722679

Change-Id: I925788776c863d898928bee8b0e2ab131c8b925a
2021-06-02 03:39:08 +00:00
Treehugger Robot
72bde32481 Merge "RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED" am: a7f8c55374
Original change: https://android-review.googlesource.com/c/platform/build/+/1722679

Change-Id: Iec1fae418dfe596185e40d4cab1c2e1fc9f9aef3
2021-06-02 03:13:31 +00:00
Treehugger Robot
a7f8c55374 Merge "RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED" 2021-06-02 02:55:07 +00:00
Yuntao Xu
0f28440f60 Merge "add LOCAL_DISABLE_TEST_CONFIG logic" am: f6cff22181 am: cfc1765cbd
Original change: https://android-review.googlesource.com/c/platform/build/+/1719472

Change-Id: I22a0925bca0601c4dc39375b2da4fdc340e7cefb
2021-06-01 22:27:53 +00:00
Colin Cross
5ef69b1ed4 Merge "Support all active codenames for BOARD_SYSTEMSDK_VERSIONS" am: 54b437286b am: e131ab1e10
Original change: https://android-review.googlesource.com/c/platform/build/+/1721370

Change-Id: I8ad39eb7f2ab075f60d03eb123392dc0488d9f72
2021-06-01 22:27:44 +00:00
Yuntao Xu
cfc1765cbd Merge "add LOCAL_DISABLE_TEST_CONFIG logic" am: f6cff22181
Original change: https://android-review.googlesource.com/c/platform/build/+/1719472

Change-Id: I841e82bbf1bc196a587c93e7e7718698e95de6b7
2021-06-01 22:16:48 +00:00
Colin Cross
e131ab1e10 Merge "Support all active codenames for BOARD_SYSTEMSDK_VERSIONS" am: 54b437286b
Original change: https://android-review.googlesource.com/c/platform/build/+/1721370

Change-Id: Iaa1ae561fbf0e4e34c3aad9a80e5f62f90046c33
2021-06-01 22:16:08 +00:00
Yuntao Xu
f6cff22181 Merge "add LOCAL_DISABLE_TEST_CONFIG logic" 2021-06-01 22:11:59 +00:00
Jaegeuk Kim
126111579d Merge changes from topic "f2fs-system" into sc-dev am: bce364b9ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14736818

Change-Id: I7e94f4e7efdbd73622ed001ee54d1531454d003f
2021-06-01 22:10:03 +00:00
Jaegeuk Kim
47925ec579 [automerger skipped] Enable --readonly for system compression am: 028f6719f3 -s ours
am skip reason: skipped by user jaegeuk

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14736817

Change-Id: I7258456b1463a95d4f00ab71b1a6179aef82159e
2021-06-01 22:10:02 +00:00
Jaegeuk Kim
bce364b9ce Merge changes from topic "f2fs-system" into sc-dev
* changes:
  Enable f2fs compression for other partitions
  Enable --readonly for system compression
2021-06-01 18:09:07 +00:00
Colin Cross
54b437286b Merge "Support all active codenames for BOARD_SYSTEMSDK_VERSIONS" 2021-06-01 17:25:02 +00:00
Jeongik Cha
f93c13d51b RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED
In the case of unbundled build, the module in vendor should use
system(_ext) module by prebuilt one. But RRO depends on system module
directly depending on some conditions(packages exporting resources)

In this change,
 1. Temporarily make LOCAL_RES_LIBRARIES empty(For now, auto generated
 RRO doesn't use overlaid package's resources), enable it when prebuilts
 are ready.
 2. According to (1), its SDK_VERSION can be current)

Bug: 187404676
Test: TARGET_BUILD_UNBUNDLED_IMAGE m vendorimage, and check if there is
no build error regarding RRO.

Change-Id: I94e3122372dd20c942b2c858070a6ca797312792
2021-06-02 00:01:01 +09:00
Tianjie Xu
8108eed6d0 Merge "Enable a prop to determine the new figerprint is enabled" am: 5260f435a3 am: d34ac59c5a
Original change: https://android-review.googlesource.com/c/platform/build/+/1716976

Change-Id: I894e32aefa3e83f287a59c5c81fa4e11e7eff140
2021-06-01 05:08:17 +00:00
Tianjie Xu
d34ac59c5a Merge "Enable a prop to determine the new figerprint is enabled" am: 5260f435a3
Original change: https://android-review.googlesource.com/c/platform/build/+/1716976

Change-Id: I5762f6a1ea981fe29ab49e2601df5ffef8351653
2021-06-01 04:46:16 +00:00