Commit Graph

67344 Commits

Author SHA1 Message Date
Treehugger Robot 2f81984b9f Merge "Updates merge_target_files soong_zip to use -r instead of -l." am: e51dcceae1
Original change: https://android-review.googlesource.com/c/platform/build/+/1579117

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic75f27f1426f0c49f9baba504fced5e00695e1b1
2021-02-09 23:52:44 +00:00
Treehugger Robot e51dcceae1 Merge "Updates merge_target_files soong_zip to use -r instead of -l." 2021-02-09 23:11:09 +00:00
Kelvin Zhang 645dcb8264 Make common.py python3 compatible
Test: th
Change-Id: Ibe4db0a367b7b8df5eeb7f2a6d0816e8e18bf342
2021-02-09 17:53:09 -05:00
Treehugger Robot 8a5a7e4f0c Merge changes from topic "ps 2.0 cp" am: 1975c1ba63
Original change: https://android-review.googlesource.com/c/platform/build/+/1576337

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e4b7155879773bd24fea5b6767dbd6ffc5b101e
2021-02-09 22:21:24 +00:00
Benjamin Schwartz 8d7107dcb1 powerstats: PowerStats HAL has been renamed am: 2430e7e3a3
Original change: https://android-review.googlesource.com/c/platform/build/+/1575998

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6bb91b7e1c07ab1b187fb2d5259277db9302ed90
2021-02-09 22:21:19 +00:00
Benjamin Schwartz 5f59ddf5dc Create Power Stats AIDL interface am: 0cca4d0211
Original change: https://android-review.googlesource.com/c/platform/build/+/1575997

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1937f0aa03f90d418b7061245d955cee05628f4c
2021-02-09 22:20:57 +00:00
Bob Badour 5feee0e957 Fix license_type. Contains GPL
See: http://go/android-license-checking-v2-lsc

Test: m all

Bug: 151953481
Bug: 151177513
Bug: 67772237

Exempt-From-Owner-Approval: janitorial work
Change-Id: I43f76a40157a912aaab7429225a2bd1fdf6646d6
2021-02-09 14:00:16 -08:00
Treehugger Robot 1975c1ba63 Merge changes from topic "ps 2.0 cp"
* changes:
  update vndk list
  powerstats: PowerStats HAL has been renamed
  Create Power Stats AIDL interface
2021-02-09 19:20:10 +00:00
Daniel Norman eaf5c1dca2 Updates merge_target_files soong_zip to use -r instead of -l.
This is needed due to output artifacts in the zip that confuse globbing,
such as [.

(Also changes this call to RunAndCheckOutput, which prints the stderror
by default instead of RunAndWait which does not. Removes RunAndWait
which is now unused)

Bug: 179799226
Test: Run merge_target_files to merge two partial builds
Change-Id: Ibf8a5b0c013c9cd8b1e61195d97583f247d97c6f
2021-02-09 11:01:42 -08:00
Jose Galmes 7185c6c500 Implement directed recovery snapshot.
Bug: 177451657
Test: m -j nothing
Change-Id: I902afe71e7577c1c41371f1422512170edf6e492
2021-02-09 07:41:40 -08:00
Treehugger Robot fb1b971b36 Merge "Add flag to manually disable vabc" am: 41f416d326
Original change: https://android-review.googlesource.com/c/platform/build/+/1573760

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia850c8a015ca601f3f981959fe265b0903494f68
2021-02-09 02:05:48 +00:00
Treehugger Robot 41f416d326 Merge "Add flag to manually disable vabc" 2021-02-09 01:14:50 +00:00
Treehugger Robot 8f28dc0e5e Merge "extract_kernel: make it py2/py3 compatible" am: 6c9e319da7
Original change: https://android-review.googlesource.com/c/platform/build/+/1562760

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie29e7a9451924a0191a63e7817a78c71c61148ae
2021-02-09 00:31:24 +00:00
Treehugger Robot 6c9e319da7 Merge "extract_kernel: make it py2/py3 compatible" 2021-02-08 23:49:15 +00:00
Calin Juravle b7e744cd82 Update the default compiler filter used at boot time
For the first-boot (happening after upgrades) use verify as quicken is deprecated.

For the usual boot operations use extract instead of the verify. Under normal behaviour all apps should already be optimized (either with the first-boot option, a/b option or in bg-dexopt). This will speed up the boot process in corner cases and reduce resource contention that could make the device janky in at boot time.

Bug: 172114559
Change-Id: I33f204911bdc825bf6731feb5cea7c260382798b
Test: m
2021-02-08 14:25:46 -08:00
Treehugger Robot 5829d7764c Merge "Turn missing jarjar output files into errors" am: a5dcac761f
Original change: https://android-review.googlesource.com/c/platform/build/+/1580661

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic33981279baae6651063b91dbceaf110363a296a
2021-02-08 22:12:56 +00:00
Treehugger Robot a5dcac761f Merge "Turn missing jarjar output files into errors" 2021-02-08 22:00:02 +00:00
Julien Desprez c11f680b07 Merge "Clean TEST_MAPPING config based on go/a-unit-tests" am: 1514b9a581
Original change: https://android-review.googlesource.com/c/platform/build/+/1574711

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a3812bd2494d218ea7f756b5b90cd0841b59ad7
2021-02-08 21:37:45 +00:00
Julien Desprez 1514b9a581 Merge "Clean TEST_MAPPING config based on go/a-unit-tests" 2021-02-08 21:25:05 +00:00
Treehugger Robot 90bd66aad9 Merge "Remove Use_lmkd_stats_log from build" am: c5bbb1ead1
Original change: https://android-review.googlesource.com/c/platform/build/+/1579530

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8698d82da31a5d52d0161b307f30e8a75e99306
2021-02-08 21:06:38 +00:00
Treehugger Robot c5bbb1ead1 Merge "Remove Use_lmkd_stats_log from build" 2021-02-08 20:58:19 +00:00
Treehugger Robot 38aea6ebe4 Merge "Keystore 2.0: Disable keystore 2 by default (for now)" am: 7ef7116014
Original change: https://android-review.googlesource.com/c/platform/build/+/1578147

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4449c53ee87eaefaf9be7ef202e8735995fb4b24
2021-02-08 20:52:01 +00:00
Treehugger Robot 7ef7116014 Merge "Keystore 2.0: Disable keystore 2 by default (for now)" 2021-02-08 20:04:38 +00:00
Colin Cross a1271eb343 Turn missing jarjar output files into errors
Jarjar doesn't exit with a nonzero return code when there is a syntax
error in a rules file and doesn't write the output file.  Without a
nonzero return code ninja prints a warning but continues, which leads
to stale results on incremental builds where the output file already
exists, or delayed errors on clean builds whre the output file didn't
exist.

Delete the output file before running jarjar, and then check if it
exists after running jarjar.

Fixes: 119516143
Test: m out/target/common/obj/JAVA_LIBRARIES/noto-emoji-compat-java_intermediates/classes-jarjar.jar
Change-Id: Ib99167403948ee11f039dd4d2d7e63052bb92136
2021-02-08 10:55:05 -08:00
Ioannis Ilkos 8e568c52ab Remove Use_lmkd_stats_log from build
Use_lmkd_stats_log used to control LMKD_LOG_STATS when compiling lmkd.

However, for newer Android releases, we mandate that lmkd informs statsd of process kills (change id I8cb123b9488fbc6e88863c2f0e75f1422bcd282e)
After aosp/1555318 we compile lmkd with statsd by default, so this setting is a noop.

Change-Id: I91bd08198fe2275fb8aca77ae5ea637df360d416
Test: build
Bug: 177985094
2021-02-08 11:17:55 +00:00
Yo Chiang ecaa592310 Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk
Set PRODUCT_SHIPPING_API_LEVEL to the latest value (instead of empty) so
that GSIs are always built with the latest build system default configs,
such as PRODUCT_FULL_TREBLE := true and
PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true.

Bug: 177495407
Test: Presubmit build_test
Change-Id: Iabd67656c5ed1de8327c40f0f9f604841f24764b
2021-02-08 12:45:15 +08:00
Kelvin Zhang bbfa182995 Add flag to manually disable vabc
Test: ota_from_target_files --disable_vabc
Change-Id: I9ae9ce2c3173909c335708329e787ae45dc5da6b
2021-02-07 10:43:15 -05:00
cfig 791378cda1
extract_kernel: make it py2/py3 compatible
use py3 for AOSP build, while the script itself can be
executed under py2/py3 environment directly.

TEST: extract info from Pixel 4 kernel

Change-Id: I00db6dabb1ff93f0758017a666c476816caefae7
2021-02-07 17:05:53 +08:00
Treehugger Robot c29df1c8d1 Merge "Adding repack_bootimg into otatools.zip" am: bff5273dd0
Original change: https://android-review.googlesource.com/c/platform/build/+/1576989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2bea6fab99d2fe54f8ff14130a93087fcfe3a4e4
2021-02-06 08:28:24 +00:00
Treehugger Robot bff5273dd0 Merge "Adding repack_bootimg into otatools.zip" 2021-02-06 08:00:55 +00:00
Janis Danisevskis a3c5395672 Keystore 2.0: Disable keystore 2 by default (for now)
Test: System starts without keystore 2 running.
Bug: 160623310
Change-Id: I83d54de602a0f70acc91fd8e55b07706e1b4e55b
2021-02-05 14:39:43 -08:00
Colin Cross c5af7ef2bd Merge "Use RSP file for soong_zip in target_files.zip" am: effaa0414b
Original change: https://android-review.googlesource.com/c/platform/build/+/1573860

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85b8ae001ab1f2a1bc62405991621dff0b6058c0
2021-02-05 21:54:46 +00:00
Colin Cross effaa0414b Merge "Use RSP file for soong_zip in target_files.zip" 2021-02-05 21:33:37 +00:00
Treehugger Robot 519547ea53 Merge "GSI: enable dynamic partitions" am: e174dca416
Original change: https://android-review.googlesource.com/c/platform/build/+/1576992

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ac305fda8a1470f7d4c8f42f86d3391bd1405b1
2021-02-05 18:59:27 +00:00
Treehugger Robot e174dca416 Merge "GSI: enable dynamic partitions" 2021-02-05 18:34:38 +00:00
Jeongik Cha de2d7b11e6 update vndk list
Bug: 150578172
Test: m
Change-Id: Ifc160fc225883cc226bfcbacc8607f6f96d9501a
Merged-In: I76e73668faf248ca33a37eb221973d2164d9c9b8
2021-02-05 10:05:49 -08:00
Treehugger Robot 83d70e8b9c Merge "Add logic to ensure the ART APEXes are built from source in coverage builds." am: 530b39afc9
Original change: https://android-review.googlesource.com/c/platform/build/+/1570740

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2614febe66e93d485912f85488b2b1394e68f23
2021-02-05 14:22:13 +00:00
Treehugger Robot 530b39afc9 Merge "Add logic to ensure the ART APEXes are built from source in coverage builds." 2021-02-05 13:49:53 +00:00
Ulyana Trafimovich 14bd7995f9 Merge "Don't patch build path to DEX jar in dex_preopt_config_merger.py." am: 966928196d
Original change: https://android-review.googlesource.com/c/platform/build/+/1574724

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e5429dbf32b90ef3ee20b1299d9891da6dd6deb
2021-02-05 11:50:59 +00:00
Ulyana Trafimovich 966928196d Merge "Don't patch build path to DEX jar in dex_preopt_config_merger.py." 2021-02-05 11:10:03 +00:00
Hung-ying Tyan 4ae09765b7 GSI: enable dynamic partitions
to facilitate mixing GSI onto Cuttlefish

Bug: 178677060
Bug: 179455901
Test: build gsi_x86_64 and aosp_arm64 and check the existence of
      'dynamic_partition_list' in misc_info.txt

Change-Id: I0fd9e9645d4882e2cd7d3508a44fbcad5dce81bc
2021-02-05 18:50:28 +08:00
Bowgo Tsai 6c37c172c6 Adding repack_bootimg into otatools.zip
repack_bootimg is useful to add files into a ramdisk, then repack
a boot.img. Note that mkbootimg, unpack_bootimg, lz4, minigzip, etc.,
that repack_bootimg depends are already in otatools.zip.

Bug: 174443192
Test: `m otatools-package`, unzip $OUT/otatools.zip, export $PATH
      with ./otatools/bin and checks unpack_bootimg can run
Change-Id: Id4fbf2076b50522b95ab46dfeb1e2b7115d6606d
2021-02-05 18:14:34 +08:00
Yi-Yo Chiang c12dd84d01 Kernel modules: add modules.blocklist build support
BOARD_<partition>_KERNEL_MODULES_BLOCKLIST_FILE<kernel_version> checks
the syntax of and installs a prebuilt modules.blocklist file.

Example usage:
```
BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := \
  $(wildcard <path to prebuilt modules.blocklist>)
```

Then the modules blocklist would be install to
(vendor|vendor_dlkm)/lib/modules/modules.blocklist.

Bug: 175165656
Test: Create a blocklist with incorrect syntax, verify build fails
Test: Verify the new macro indeed installs the blocklist file
Change-Id: Icb75aae1bdb45546792f28f4c4e8d06d9439391a
2021-02-05 16:28:34 +08:00
Yan Yan ab282be1c7 Add IKE to bcp and remove it from system server classpath
Bug: 177266501
Test: builds
Change-Id: I90df69a4b892a3faab8097111756c1f42c4cfb68
Merged-In: I90df69a4b892a3faab8097111756c1f42c4cfb68
2021-02-04 23:33:43 -08:00
Benjamin Schwartz 2430e7e3a3 powerstats: PowerStats HAL has been renamed
Bug: 169864180
Test: m
Change-Id: I1a1680d94bda3a97f4a5c074ba47a7e57e1241ad
(cherry picked from commit 75a532279d)
Merged-In: I1a1680d94bda3a97f4a5c074ba47a7e57e1241ad
2021-02-04 16:51:37 -08:00
Benjamin Schwartz 0cca4d0211 Create Power Stats AIDL interface
Bug: 162472196
Test: m
Change-Id: I195ace557e1db2894d12f6f15d4db494d358c8e8
Merged-In: I195ace557e1db2894d12f6f15d4db494d358c8e8
2021-02-04 16:01:46 -08:00
android-build-team Robot b5290f8271 Version bump to RQ2A.210305.007 [core/build_id.mk]
Change-Id: I196a6acebe0e40411bccb96da8e475c8dea94b1a
2021-02-04 22:27:50 +00:00
Bill Yi 5a39095fbc [automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 250a0420ea -s ours
am skip reason: Change-Id Ibf5ea0aaf1cf42c08f32e435b1164598410ac44a with SHA-1 697af28902 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac87d5dab930ef340177597363dbb74ae8b86011
2021-02-04 18:19:20 +00:00
Julien Desprez 0c09471cc3 Clean TEST_MAPPING config based on go/a-unit-tests
unit_tests:true do not need TEST_MAPPING files

Test: presubmit
Bug: 178646865
Change-Id: Id36e98ce661dc2052e333b2644202361127939a5
2021-02-04 09:12:05 -08:00
Bill Yi 250a0420ea Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" 2021-02-04 17:08:42 +00:00