Commit Graph

67790 Commits

Author SHA1 Message Date
Bill Peckham
16da01fe20 Introduce droidcore-unbundled target
The droidcore-unbundled target replaces the droidcore
target when TARGET_BUILD_UNBUNDLED_IMAGE=true. This
target is similar to droidcore in terms of dependencies,
but it has a smaller set of dist files. The intention is
to use TARGET_BUILD_UNBUNDLED_IMAGE=true with a
VSDK-using vendor build to supply Java dependencies from
prebuilts to avoid building (or needing) Java framework
sources.

Test: build with and without TARGET_BUILD_UNBUNDLED_IMAGE=true
Test: m nothing dist (before patch)
Test: m nothing dist (after patch)
Test: m nothing dist TARGET_BUILD_UNBUNDLED_IMAGE=true (after patch)
Test: examine ninja build graph for previous 3 tests
Bug: 188176942
Bug: 187064252
Merged-In: Ia7f8200c1bb1aaaa57c177d1698a114efe26bec7
Change-Id: Ia7f8200c1bb1aaaa57c177d1698a114efe26bec7
2021-06-16 09:10:07 -07:00
Anton Hansson
757e2e1fc1 Merge "Add help message for likely typo to lunch" 2021-06-15 09:49:31 +00:00
Treehugger Robot
c09cda8c6c Merge "Add ro.vendor.build.dont_use_vabc to disable VABC OTA" 2021-06-14 18:37:29 +00:00
Anton Hansson
32fa7ee8c3 Add help message for likely typo to lunch
Test: lunch aosp_blueline_userdebug
Change-Id: Ieb8059d1717a98f66d61387d6bfd28470835eb6e
2021-06-14 17:21:22 +01:00
Kelvin Zhang
10eac08fe1 Add ro.vendor.build.dont_use_vabc to disable VABC OTA
This prop is owned by OEM, OEM can set this if they want to disable
VABC.

Test: m dist, make sure generated OTA has VABC disabled
Bug: 185400304

Change-Id: Iceb2fb1f399d38a51722352a86ddf68af05fa24e
2021-06-14 10:23:14 -04:00
Treehugger Robot
6497a1b7f8 Merge "Handles capex in signing script" 2021-06-12 11:40:08 +00:00
Tianjie
4d48d50036 Handles capex in signing script
Today, the signing script simply ignores capex files, because it
looks for hardcoded '.apex' suffix. Add support to handle capex
as well.

Bug: 190574334
Test: Sign a target file locally
Change-Id: I3085ca7b0396a4fbf1b220f7de44d4eafb60c3d8
2021-06-11 17:14:22 -07:00
Chih-hung Hsieh
e8872c3408 Merge "Add one more Java warning pattern" 2021-06-10 23:53:09 +00:00
Chih-Hung Hsieh
56aa27bf12 Add one more Java 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: Ibc0ef7d1df29485ab4389f5c595fac77f69e19e7
2021-06-10 14:33:54 -07:00
Chih-hung Hsieh
9c17b26ee7 Merge "Add one Asm warning pattern" 2021-06-10 21:32:30 +00:00
Devin Moore
55987b5745 Merge "Add vendor-bootconfig.img to target-files-package" 2021-06-10 21:08:17 +00:00
Treehugger Robot
72e0ffd918 Merge "Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to default_art_config.mk." 2021-06-10 15:57:53 +00:00
satayev
d56062009a 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
Merged-In: Id867ec12ab546613f63a50d608192ab5134f65bb
(cherry picked from commit 66bb2ab32d)
2021-06-10 12:46:54 +00:00
Jingwen Chen
c137b8520b Merge "Improve bazel() warning in envsetup.sh." 2021-06-10 10:29:35 +00:00
Jingwen Chen
17d569940f Improve bazel() warning in envsetup.sh.
Fixes: 190688038

Test: source ~/aosp/build/envsetup.sh && cd / && bazel
Change-Id: I309a77e109d8b3a65c4b28aeb5fbf2a059006ee0
2021-06-10 08:17:54 +00:00
Inseob Kim
0e257fcb28 Merge "Remove redundant dependency to API_FINGERPRINT" 2021-06-10 01:34:25 +00:00
Devin Moore
55af5065dc Add vendor-bootconfig.img to target-files-package
INTERNAL_VENDOR_BOOTCONFIG_TARGET is a required dependency of
target-files-package so it can be built from a clean build.

Test: rm -rf out/target/product && m target-files-package
Bug: 190329824
Change-Id: I9873aee3c9fb303d2ad245b5433d13eb76ab55f9
2021-06-09 13:19:13 -07:00
Tianjie Xu
d3c78b8cde Merge "Amend the apex info for ota package" 2021-06-09 20:16:08 +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
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
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
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
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
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
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
f6cff22181 Merge "add LOCAL_DISABLE_TEST_CONFIG logic" 2021-06-01 22:11:59 +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
5260f435a3 Merge "Enable a prop to determine the new figerprint is enabled" 2021-06-01 04:31:07 +00:00
Colin Cross
45efdc4e0e Support all active codenames for BOARD_SYSTEMSDK_VERSIONS
Use PLATFORM_VERSION_ALL_CODENAMES to construct PLATFORM_SYSTEMSDK_VERSIONS
so that both S and T are accepted while T is active but S is not finalized.

Bug: 186121492
Test: treehugger
Change-Id: Ia9f58c5986c717cb2882e2fc4daadb2b3874c6b5
2021-05-27 13:27:23 -07:00
Jaegeuk Kim
d56fb727ba Merge changes from topic "f2fs-system"
* changes:
  Enable f2fs compression for other partitions
  Enable --readonly for system compression
2021-05-27 18:42:28 +00:00
Michael Butler
63d66d3fe1 Merge "Revert "Add new llndk library, libneuralnetworks_shim.so"" 2021-05-27 18:05:25 +00:00
Yuntao Xu
32a085c041 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
2021-05-27 10:19:48 -07:00
Tianjie Xu
f4ca0567dd Merge "Check super size for factory OTA at build time" 2021-05-26 21:33:14 +00:00
Kelvin Zhang
ea7c944d62 Merge "Validate AVB props in vbmeta image" 2021-05-26 20:41:17 +00:00
Martin Stjernholm
e2077b5e3b Merge "Move logic to disable flattening in unbundled app mode from Soong to make." 2021-05-26 18:21:44 +00:00
Tianjie
c3b841a422 Enable a prop to determine the new figerprint is enabled
VTS and some other tests would replace the system images with GSI. To
put the correct fingerprint in the test report, we need to know if the
new fingerprint format is in use. So, add a vendor build prop.

OEMs are reponsible for setting this build prop, or using other ways
to put the correct fingerprint in the test report.

Bug: 188824341
Test: boot the device, check build prop
Change-Id: I6bc7f01903865fc2c256d209debdab68cd9d1bb3
2021-05-26 11:19:45 -07:00
Kelvin Zhang
4093d60f35 Validate AVB props in vbmeta image
Bug: 183055693
Test: th
Test: validate_target_files signed-redfin-target_files-7119741.zip

Change-Id: I027d474ba3eb6af5e05866551ff9ea506825a326
2021-05-26 17:59:24 +00:00
Martin Stjernholm
421990d4a4 Move logic to disable flattening in unbundled app mode from Soong to
make.

Avoids TARGET_FLATTEN_APEX lying about it, so we can trust it in
scripts, e.g. in art/build/apex/runtests.sh.

Test: banchan com.android.art; art/build/apex/runtests.sh
Bug: 179900989
Change-Id: I5d3226047e51a51ee76de2cbfad050e200568655
2021-05-26 11:55:33 +01:00
Jaegeuk Kim
1369654d8d Enable f2fs compression for other partitions
Bug: 171942852
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I231f7a2b808cc792fd582cd444825e4a47722984
2021-05-25 14:54:45 -07:00
Jaegeuk Kim
46e0ea2ce1 Enable --readonly for system compression
This option is to reduce system partition size.

Bug: 171942852
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Idc849cfce33ac0badb2b9b7953bb821c46a24472
2021-05-25 14:50:04 -07:00
Bowgo Tsai
d33ceee8e9 Merge "Support AVB signing for BOARD_PREBUILT_BOOTIMAGE" 2021-05-25 15:24:26 +00:00
Treehugger Robot
38d4a2a19e Merge "[memtag] Disable memtag for AndroidMk host modules." 2021-05-25 04:05:59 +00:00
Mitch Phillips
b71a875bba [memtag] Disable memtag for AndroidMk host modules.
BUILD_HOST_EXECUTABLE modules are substantially deprecated, but some
partners are still using them for their bits with the workaround
provided in the product definition. This fixes a build error where
the host module doesn't have a linkable ELF note archive.

MTE is not intended for host modules, and it's fine for us to say
"host module using AndroidMk - no MTE for you" if this changes.

Test: Manually tested using a BUILD_HOST_EXECUTABLE module.
Change-Id: Ifedff39f2f03c08bfb644221d2ab1b88e635c8a3
2021-05-24 18:41:15 +00:00
Calin Juravle
e9423b0b09 Merge "Add pm.dexopt.cmdline mapping in product config" 2021-05-24 15:06:35 +00:00
Michael Butler
f791bfa15c Revert "Add new llndk library, libneuralnetworks_shim.so"
This reverts commit 8685248a99.

Reason for revert: Removing libneuralnetworks_shim.so from Android S

Change-Id: I3fa3092e02e9d1bbf00d801ad68ea754bfbd8c37
Merged-In: I3fa3092e02e9d1bbf00d801ad68ea754bfbd8c37
2021-05-21 19:58:01 +00:00