Commit Graph

66368 Commits

Author SHA1 Message Date
Yifan Hong
08d1865332 Merge "Add Virtual A/B with vendor ramdisk product." 2020-12-03 03:02:35 +00:00
Daniel Norman
ee33b4ea51 Adds host_init_verifier to otatools.zip
This is needed after
commit 21c34f78e8
which starts calling host_init_verifier in merge_target_files,
a binary in releasetools.

Test: m otatools
Change-Id: Iee762de9fd6f890b5cc26ee5507da2f3f284fc14
2020-12-02 16:18:25 -08:00
Colin Cross
359f421d3b Make installed-files-recovery.txt depend on rsync timestamp
Files are copied into the recovery installation directory by a rule
that runs rsync.  The previous logic tried to avoid racing with the
rsync rule by depending on the final packaged recovery image, but
if BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT is set then
INSTALLED_RECOVERYIMAGE_TARGET is left empty and no dependency was
added.  Depend on the timestamp file used as the output of the rule
that runs rsync instead.

Test: query dependencies of installed-files-recovery.txt
Fixes: 173772240
Change-Id: I5ec77a6933e3a83fe4e4819e0e246017d824d8a5
2020-12-02 23:19:29 +00:00
Colin Cross
bbc94b0d83 Use jni_libs instead of required for signapk conscrypt JNI
Using jni_libs tells Soong to install the JNI library into
a genrule sandbox alongside the java binary.

Bug: 124313442
Test: m checkbuild
Change-Id: Ia550102c7aa483497f95ac2ea8bb01bce89ae9c1
2020-12-02 11:37:21 -08:00
Treehugger Robot
43df1d299f Merge "Switch default execution strategy to racing for developer builds" am: f4b637a2a3
Original change: https://android-review.googlesource.com/c/platform/build/+/1511688

Change-Id: I4e538a5361100b0d55ebbf6e5d4c004fd9a856eb
2020-12-02 19:00:56 +00:00
Treehugger Robot
f4b637a2a3 Merge "Switch default execution strategy to racing for developer builds" 2020-12-02 18:21:47 +00:00
Xin Li
4bc4ff3c11 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
Bug: 172690556
Merged-In: I880b5dfb7bfea4b6abef9fcb603abcb383d84f42
Change-Id: I3c3385a1c58004f1ee6124de0c86dfff614a3bf6
2020-12-02 00:03:31 -08:00
JaeMan Park
08d8128d84 Merge "Add java sdk library enforcement flag" am: 38e3f08248
Original change: https://android-review.googlesource.com/c/platform/build/+/1475760

Change-Id: I46ee3e807b3e7b7ef0cadbbfc29f52a418c3bef5
2020-12-02 05:32:18 +00:00
JaeMan Park
38e3f08248 Merge "Add java sdk library enforcement flag" 2020-12-02 04:39:08 +00:00
Kiyoung Kim
ee78309c15 Merge "Generate system stub library list at build time" am: 39f809beac
Original change: https://android-review.googlesource.com/c/platform/build/+/1498486

Change-Id: If5f8aa1b888b8f980b7418c9ec45fd92db6d2422
2020-12-02 01:44:28 +00:00
Kiyoung Kim
39f809beac Merge "Generate system stub library list at build time" 2020-12-02 00:28:18 +00:00
Colin Cross
40c9513f7f Follow argument changes to RuleBuilder
Pass pctx and ctx to NewRuleBuilder instead of RuleBuilder.Build,
and don't pass ctx to RuleBuilderCommand.BuiltTool.  Follows the
changes in I63e6597e19167393876dc2259d6f521363b7dabc.

Test: m checkbuild
Change-Id: I5d11e07ae1a24a967e379c151f4f5d7d188c6cc0
2020-12-01 16:21:51 -08:00
android-build-team Robot
e9f73e3bd0 Version bump to RQ1A.210105.003 [core/build_id.mk]
Change-Id: If4e38ab920685601f5371adf686cf05630232735
2020-12-01 23:58:02 +00:00
Treehugger Robot
35c6de13ee Merge "Update mts task to make mts-${MODULE} test suites" am: 961ef44f0b
Original change: https://android-review.googlesource.com/c/platform/build/+/1493740

Change-Id: I5f4db5b90c68fbc0f966967bd12071e9faeb8d6c
2020-12-01 22:37:46 +00:00
Treehugger Robot
961ef44f0b Merge "Update mts task to make mts-${MODULE} test suites" 2020-12-01 22:19:26 +00:00
Kiyoung Kim
36481e0b34 Generate system stub library list at build time
List of stub libraries from system (and bionic APEX) is currently
managed in static file. This change generates the list at build time and
adds to the system config so linkerconfig can use it.

Bug: 172889962
Test: Build cuttlefish and confirmed list is generated in
/system/etc/linker.config.pb

Change-Id: Idd5a93442f398dd8e88c767c694ddae64d1bb713
2020-12-01 15:33:09 +09:00
Anton Hansson
a29f2ba4d0 Merge "Add bootclasspath config to its own makefile" am: e13277f26e
Original change: https://android-review.googlesource.com/c/platform/build/+/1511788

Change-Id: Idefdb7a558f2b591c3b01e27dc02d3d29e9af901
2020-11-26 12:35:58 +00:00
Anton Hansson
e13277f26e Merge "Add bootclasspath config to its own makefile" 2020-11-26 12:20:05 +00:00
Anton Hansson
8c73673e73 Add bootclasspath config to its own makefile
This is part of adding some devices/products suitable for unbundled
builds. An unbundled product does not need all the PRODUCT_PACKAGES
etc present in the normal hierarchy of products, but does need to know
which jars are on the bootclasspath.

Therefore, factor out the bootclasspath config from base_system.mk and
put it in its own makefile where it can be inherited by these unbundled
products.

Bug: 172256440
Test: diff presubmit artifacts (noop)
Merged-In: Id3f91e387bba2e0525b4010f22fe380d1d8be537
Change-Id: Id3f91e387bba2e0525b4010f22fe380d1d8be537
2020-11-25 18:53:37 +00:00
Daniel Norman
016c7fa4a4 Merge "Runs host_init_verifier on merged target files packages." am: e9fdfb9fea
Original change: https://android-review.googlesource.com/c/platform/build/+/1497138

Change-Id: Id64e8461adc7ebd0d5c41f195c91284771fd5084
2020-11-25 18:29:15 +00:00
Daniel Norman
e9fdfb9fea Merge "Runs host_init_verifier on merged target files packages." 2020-11-25 18:13:30 +00:00
Chih-hung Hsieh
3692392864 Merge "Dump a new CSV with warning messages" am: 5364ffafa9
Original change: https://android-review.googlesource.com/c/platform/build/+/1502352

Change-Id: Ib20ddecbc1a2b15b0b2dbcad76b45e55e915266a
2020-11-25 17:51:02 +00:00
Chih-hung Hsieh
5364ffafa9 Merge "Dump a new CSV with warning messages" 2020-11-25 17:38:21 +00:00
Kousik Kumar
f16d798822 Switch default execution strategy to racing for developer builds
This is to efficiently use both local and remote resources when using
RBE for Android developers.

Bug: b/170699893
Change-Id: I46bc3ff9c0d8d08e8f3aaa15076eb606737355af
2020-11-25 12:14:16 -05:00
Julien Desprez
67e5ec6202 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
2020-11-24 13:20:04 -08:00
Kousik Kumar
5985b89536 Merge "Use unified cas uploads / downloads" am: e5b0fbd21a
Original change: https://android-review.googlesource.com/c/platform/build/+/1509332

Change-Id: If45e22b739a0ce7830a5dca24ccaa07d4657d44a
2020-11-24 19:24:57 +00:00
Kousik Kumar
e5b0fbd21a Merge "Use unified cas uploads / downloads" 2020-11-24 18:52:13 +00:00
Daniel Norman
21c34f78e8 Runs host_init_verifier on merged target files packages.
This verifies the init rc files in the merged result.

Bug: 163089173
Test: test_common.py
Test: Run merge_target_files.py to merge two target-files packages where
      one has init_rc errors. Observe script failure.
Test: Run merge_target_files.py on two good target-files packages,
      observe no failure.
Change-Id: I86c8e5a2bc07c2c1896ac40afd32bc1d055447ee
2020-11-24 17:26:27 +00:00
Kousik Kumar
aa79007e04 Use unified cas uploads / downloads
This is to deduplciate uploads and downloads when running builds with
RBE. Especially useful for certain Java / R8 / D8 actions that have JAR
files as common inputs.

Change-Id: I0459d4e5c89bd93e5c0c53195fdabccabec08674
2020-11-24 10:56:32 -05:00
Saeid Farivar Asanjan
75dc8d2dab Dump a new CSV with warning messages
Bug: 171068870
Test: manual
Change-Id: Ibb528940daf9a6cd99ece8e5a63d67aacdfc131c
2020-11-24 05:46:33 +00:00
Jingwen Chen
19bddeb6f6 Merge "Remove SOONG, SOONG_BUILD_NINJA, SOONG_IN_MAKE and SOONG_BOOTSTRAP." am: 5569faae37
Original change: https://android-review.googlesource.com/c/platform/build/+/1507481

Change-Id: Iee112c36d35ad7e4cb2f852e99fce068ec503f5f
2020-11-24 02:25:46 +00:00
Treehugger Robot
00e93eecd3 Merge "Try to find host tools in the same directory as the caller" am: 84e9bf1a94
Original change: https://android-review.googlesource.com/c/platform/build/+/1505833

Change-Id: I8c515ade2322a6fa54a807ca7da92ee88b6d0984
2020-11-24 02:25:26 +00:00
Treehugger Robot
e4b1c1c64e Merge changes from topic "vab_makefile_move" am: 3e2f8dae78
Original change: https://android-review.googlesource.com/c/platform/build/+/1506504

Change-Id: Ia6630c729c9e51abe47659d9f6769e950c58ea1b
2020-11-24 02:24:47 +00:00
Jingwen Chen
5569faae37 Merge "Remove SOONG, SOONG_BUILD_NINJA, SOONG_IN_MAKE and SOONG_BOOTSTRAP." 2020-11-24 02:09:21 +00:00
Treehugger Robot
84e9bf1a94 Merge "Try to find host tools in the same directory as the caller" 2020-11-24 02:05:39 +00:00
Treehugger Robot
3e2f8dae78 Merge changes from topic "vab_makefile_move"
* changes:
  Add symlinks to legacy Virtual A/B makefiles.
  Move virtual_ab makefiles to its own dir.
2020-11-24 01:55:21 +00:00
Treehugger Robot
e498803ad5 Merge "build: make fs_config_generator.py python2 explicitly" am: bda655cead
Original change: https://android-review.googlesource.com/c/platform/build/+/1478497

Change-Id: Ib0439a95fa0130c108f3622442beac8dad30ec24
2020-11-23 23:43:03 +00:00
Yifan Hong
6b7cc73ec5 Add Virtual A/B with vendor ramdisk product.
If vendor_ramdisk exists, it is preferred to use launch_with_vendor_ramdisk.mk
because it moves e2fsck to vendor_ramdisk, making ramdisk smaller.

Devices that uses VABC is assumed to have a vendor ramdisk, so inherit
from this new makefile.

Test: pass
Change-Id: If6adad9985ca4750225fd4263edb42de1ddaf486
2020-11-23 15:17:01 -08:00
Yifan Hong
942987d116 Add symlinks to legacy Virtual A/B makefiles.
For Virtual A/B makefiles that is created before S, add
symlinks so that existing devices don't break.

Test: pass
Change-Id: Ie04c4a8a2375edc673a8a7a2adcd162b21178f68
2020-11-23 15:17:01 -08:00
Yifan Hong
018c698280 Move virtual_ab makefiles to its own dir.
Also add a readme file.

Test: none

Change-Id: Ia1e02d8fb0c6df13271f208b3ca1dc1f250b085b
2020-11-23 15:17:01 -08:00
Treehugger Robot
bda655cead Merge "build: make fs_config_generator.py python2 explicitly" 2020-11-23 23:08:22 +00:00
David Anderson
f32cb7f738 Merge "Move snapuserd into the vendor ramdisk." am: 01585c5ce6
Original change: https://android-review.googlesource.com/c/platform/build/+/1501055

Change-Id: Id1b6b561cd174fb8dc037e7290e4fc3ccee4e54e
2020-11-23 21:38:07 +00:00
David Anderson
01585c5ce6 Merge "Move snapuserd into the vendor ramdisk." 2020-11-23 21:18:07 +00:00
Kelvin Zhang
c2fbbbe61f Merge "Add --disable_verity_computation option to ota script" am: 788055c00b
Original change: https://android-review.googlesource.com/c/platform/build/+/1506878

Change-Id: I44c3663dab538a2a5a0e48d448fd57862ddf03ff
2020-11-23 20:20:09 +00:00
Treehugger Robot
a0ceb3c124 Merge "Add installed-files-vendor-ramdisk.txt" am: 1393da036e
Original change: https://android-review.googlesource.com/c/platform/build/+/1507726

Change-Id: Iec5ec53fc94bc53a3ed2d5d475cffa440accaff7
2020-11-23 20:19:49 +00:00
Kelvin Zhang
788055c00b Merge "Add --disable_verity_computation option to ota script" 2020-11-23 19:43:24 +00:00
Treehugger Robot
1393da036e Merge "Add installed-files-vendor-ramdisk.txt" 2020-11-23 19:35:00 +00:00
Kelvin Zhang
caf7bbc39e Add --disable_verity_computation option to ota script
Test: treehugger, generate an OTA with --disable_verity_computation, serve it to
VABC device. Make sure it works

Change-Id: I0a5f3c018727cb3eed3edd004d60d09d13e34039
2020-11-23 13:24:34 -05:00
Jingwen Chen
341928ecc5 Remove SOONG, SOONG_BUILD_NINJA, SOONG_IN_MAKE and SOONG_BOOTSTRAP.
These variables appear to be unused since Nougat, when Soong was
invoked through Make. This is no longer the case, since soong_build is
now invoked through soong_ui.

https://cs.android.com/android/platform/superproject/+/android-7.1.2_r36:build/core/soong.mk

Test: TH presubmit
Change-Id: I1cfe63144d559fa0da0e54474ed1e36fb3fa0555
2020-11-23 02:06:57 -05:00
Petri Gynther
6ff5201ce9 Add installed-files-vendor-ramdisk.txt
Add installed-files-vendor-ramdisk.txt build artifact, so that it is
easy to see what files landed on the vendor ramdisk.

Test: clean build, inspect installed-files-vendor-ramdisk.txt
Change-Id: Ie84d06dc968ad972ab2bfa79db4d1839ba09e09f
2020-11-20 16:59:57 -08:00