Commit Graph

75826 Commits

Author SHA1 Message Date
Treehugger Robot
c817796067 Merge "Allow missing key for misc_info lookups." am: 54188ba009 am: 39ec08569c
Original change: https://android-review.googlesource.com/c/platform/build/+/2007930

Change-Id: Id3fa892c802a490ee80248810f356926c3f590e1
2022-03-04 00:39:56 +00:00
Treehugger Robot
39ec08569c Merge "Allow missing key for misc_info lookups." am: 54188ba009
Original change: https://android-review.googlesource.com/c/platform/build/+/2007930

Change-Id: I9d91627787936369a4931451c7f3dc21711a6c16
2022-03-04 00:15:05 +00:00
Treehugger Robot
54188ba009 Merge "Allow missing key for misc_info lookups." 2022-03-03 23:46:15 +00:00
Daniel Norman
c44f964a5a Allow missing key for misc_info lookups.
This broke the TV-VF build in ab/8246202.

Change-Id: Ifbf76a3c43c46fcd4280180e45ad23fcbed9346d
2022-03-03 19:42:32 +00:00
Treehugger Robot
701b9ea802 Merge "Add SPL downgrade option help text" am: 0b6921be2b am: 075daf7363
Original change: https://android-review.googlesource.com/c/platform/build/+/2005090

Change-Id: Idbc8840c924ba60c57f018a27680afa4cd71a0ea
2022-03-03 18:48:33 +00:00
Treehugger Robot
075daf7363 Merge "Add SPL downgrade option help text" am: 0b6921be2b
Original change: https://android-review.googlesource.com/c/platform/build/+/2005090

Change-Id: I5642277743a9b63b0240415d50927f35e6c3a20d
2022-03-03 18:24:35 +00:00
Treehugger Robot
0b6921be2b Merge "Add SPL downgrade option help text" 2022-03-03 17:56:41 +00:00
Treehugger Robot
6fd34f2965 Merge "Clean up merge_target_files" am: 5b48aeccb2 am: 168ea6a2b9
Original change: https://android-review.googlesource.com/c/platform/build/+/2002319

Change-Id: I1c6d5146f3b2cc45bf9a768161ab8dad40f15b01
2022-03-03 00:41:26 +00:00
Treehugger Robot
168ea6a2b9 Merge "Clean up merge_target_files" am: 5b48aeccb2
Original change: https://android-review.googlesource.com/c/platform/build/+/2002319

Change-Id: Iddd34c28b1272dd81bea8f155876f8f7b9e0a876
2022-03-03 00:19:21 +00:00
Treehugger Robot
5b48aeccb2 Merge "Clean up merge_target_files" 2022-03-02 23:51:31 +00:00
Cole Faust
9b65259574 Merge "Add Starlark implementation of add-product-dex-preopt-module-config" am: 339d56308d am: 3f8f28026e
Original change: https://android-review.googlesource.com/c/platform/build/+/2002313

Change-Id: I3168e53c1da9e76ef3fb6a72e7249a12b923d053
2022-03-02 19:32:13 +00:00
Cole Faust
3f8f28026e Merge "Add Starlark implementation of add-product-dex-preopt-module-config" am: 339d56308d
Original change: https://android-review.googlesource.com/c/platform/build/+/2002313

Change-Id: I951c84fd3ac06ad25ff8a3c7349ee61b767a400c
2022-03-02 19:07:51 +00:00
Cole Faust
339d56308d Merge "Add Starlark implementation of add-product-dex-preopt-module-config" 2022-03-02 18:40:36 +00:00
Paul Hu
7fe3a47b68 Merge "Rename framework-connectivity-tiramisu to framework-connectivity-t" am: 70dc07dbd3 am: 8b81343e39
Original change: https://android-review.googlesource.com/c/platform/build/+/1976806

Change-Id: Ib745287298e60a21f021e9d586c8cb9d0e6b2d6d
2022-03-02 07:48:40 +00:00
Paul Hu
8b81343e39 Merge "Rename framework-connectivity-tiramisu to framework-connectivity-t" am: 70dc07dbd3
Original change: https://android-review.googlesource.com/c/platform/build/+/1976806

Change-Id: I1be61a70760e41474cd227a202a9ed19d29b384f
2022-03-02 07:27:23 +00:00
Paul Hu
70dc07dbd3 Merge "Rename framework-connectivity-tiramisu to framework-connectivity-t" 2022-03-02 07:11:25 +00:00
Treehugger Robot
7cdb6c016c Merge "Revert "[cc_fuzz] Revert 'disable LTO' patches."" am: ff17a1bd66 am: 857fa04e03
Original change: https://android-review.googlesource.com/c/platform/build/+/2004384

Change-Id: Icfa502d6ed2dde6cac992442458fafa2f8c199c4
2022-03-02 06:05:39 +00:00
Treehugger Robot
857fa04e03 Merge "Revert "[cc_fuzz] Revert 'disable LTO' patches."" am: ff17a1bd66
Original change: https://android-review.googlesource.com/c/platform/build/+/2004384

Change-Id: I37e5fcc920a6fa9e4b64d4a63aaa881bfca82ce6
2022-03-02 05:33:43 +00:00
Treehugger Robot
ff17a1bd66 Merge "Revert "[cc_fuzz] Revert 'disable LTO' patches."" 2022-03-02 05:08:27 +00:00
Treehugger Robot
945140a4b4 Merge "Fix releasetools OWNERS for merge." am: 92c59c42d3 am: 7f0a03e6cc
Original change: https://android-review.googlesource.com/c/platform/build/+/2004390

Change-Id: I8d11c9d7a5735ddc8ce6c346ec076ffbfa58bf40
2022-03-02 01:51:40 +00:00
Akilesh Kailash
dc40e465b4 Merge "Enable Async merge during OTA" am: 6eb483745b am: 5b33dc20ae
Original change: https://android-review.googlesource.com/c/platform/build/+/2001772

Change-Id: I863d615b6fa783df7c49303fd33d45360e674ccd
2022-03-02 01:51:20 +00:00
Treehugger Robot
7f0a03e6cc Merge "Fix releasetools OWNERS for merge." am: 92c59c42d3
Original change: https://android-review.googlesource.com/c/platform/build/+/2004390

Change-Id: I9d0d5bb54f7871cef5979210adb09e85b7fa6b5c
2022-03-02 01:39:43 +00:00
Treehugger Robot
92c59c42d3 Merge "Fix releasetools OWNERS for merge." 2022-03-02 01:32:34 +00:00
Akilesh Kailash
5b33dc20ae Merge "Enable Async merge during OTA" am: 6eb483745b
Original change: https://android-review.googlesource.com/c/platform/build/+/2001772

Change-Id: I18acbfd77ad2b5a615679eff74651fa54a9bfcef
2022-03-02 01:29:15 +00:00
Mitch Phillips
d51048acdd Revert "[cc_fuzz] Revert 'disable LTO' patches."
Revert "[cc_fuzz] Revert 'disable LTO' patches."

Revert submission 1976512-revert-nolto-fuzzing

Reason for revert: b/222160662
Reverted Changes:
Iacee4fa29:[cc_fuzz] Revert 'disable LTO' patches.
Ic509b00a1:[cc_fuzz] Revert 'disable LTO' patches.
If85931f09:[cc_fuzz] Revert 'disable LTO' patches.

Change-Id: I5f34731f0b7b27293636217f43d1cf5f17ab487b
2022-03-02 01:25:22 +00:00
Akilesh Kailash
6eb483745b Merge "Enable Async merge during OTA" 2022-03-02 01:05:24 +00:00
Colin Cross
400a979b88 Merge "Add PLATFORM_DISPLAY_VERSION" am: 1fa84f1135 am: 552c2d1c81
Original change: https://android-review.googlesource.com/c/platform/build/+/2002322

Change-Id: I184be6d3aa140d09d5c7e83c8b242fca704ebc38
2022-03-02 00:34:34 +00:00
Treehugger Robot
2ff34809c7 Merge "[cc_fuzz] Revert 'disable LTO' patches." am: df80322fcd am: 7bf9d4e1fa
Original change: https://android-review.googlesource.com/c/platform/build/+/1976676

Change-Id: I0c3453928e7da6aeba29bb4519e230d6dfb71c2b
2022-03-02 00:33:57 +00:00
Colin Cross
552c2d1c81 Merge "Add PLATFORM_DISPLAY_VERSION" am: 1fa84f1135
Original change: https://android-review.googlesource.com/c/platform/build/+/2002322

Change-Id: I06dd0a5eef6a5dd16b1fd4b2d845d0de2ef088c9
2022-03-02 00:13:01 +00:00
Treehugger Robot
7bf9d4e1fa Merge "[cc_fuzz] Revert 'disable LTO' patches." am: df80322fcd
Original change: https://android-review.googlesource.com/c/platform/build/+/1976676

Change-Id: I94fbac5906c7864a750792333060068650e51404
2022-03-02 00:11:53 +00:00
Colin Cross
1fa84f1135 Merge "Add PLATFORM_DISPLAY_VERSION" 2022-03-02 00:01:05 +00:00
Kelvin Zhang
e174c323e1 Add SPL downgrade option help text
Test: th
Change-Id: I71f916642f6327acad1d0c163a204718002f876d
2022-03-01 15:59:08 -08:00
Treehugger Robot
df80322fcd Merge "[cc_fuzz] Revert 'disable LTO' patches." 2022-03-01 23:43:04 +00:00
Daniel Norman
5177fcb28d Fix releasetools OWNERS for merge.
My extra _ meant that OWNERS was removed for merge_target_files.

Change-Id: I15f89b9edf31d126df19b66998520e8545cdfbd0
2022-03-01 17:58:34 +00:00
Liz Kammer
52f1ce8473 Merge "Introduce BUILD_BROKEN_INPUT_DIR_MODULES" am: 16e2fc2da1 am: 0ac682fc9a
Original change: https://android-review.googlesource.com/c/platform/build/+/1966254

Change-Id: I62a726a4d418efb6dc82b95cb5f5accf3af0bebb
2022-03-01 16:13:27 +00:00
Liz Kammer
0ac682fc9a Merge "Introduce BUILD_BROKEN_INPUT_DIR_MODULES" am: 16e2fc2da1
Original change: https://android-review.googlesource.com/c/platform/build/+/1966254

Change-Id: I789ab17d3f3b73e66502c90d9eb5cc32313514bd
2022-03-01 15:47:55 +00:00
Liz Kammer
16e2fc2da1 Merge "Introduce BUILD_BROKEN_INPUT_DIR_MODULES" 2022-03-01 15:19:34 +00:00
Yi-yo Chiang
4e8705b181 Merge changes from topic "gki-avb-vts" am: 9d164b6300 am: e93bc67cf8
Original change: https://android-review.googlesource.com/c/platform/build/+/1999071

Change-Id: Ie1685e3db923366676404465fe846d59f3559def
2022-03-01 05:36:25 +00:00
Yi-yo Chiang
e93bc67cf8 Merge changes from topic "gki-avb-vts" am: 9d164b6300
Original change: https://android-review.googlesource.com/c/platform/build/+/1999071

Change-Id: I2792c3946e3b0173b3592612009eafd62e1090cc
2022-03-01 05:12:46 +00:00
Yi-yo Chiang
9d164b6300 Merge changes from topic "gki-avb-vts"
* changes:
  releasetools: Update T GKI certification scheme
  Update T GKI certification scheme
2022-03-01 04:47:47 +00:00
Treehugger Robot
6dde81f3f5 Merge "Add to OWNERS for merge tooling." am: 171c1e168e am: 0e0e961191
Original change: https://android-review.googlesource.com/c/platform/build/+/2003097

Change-Id: Ide10c28fb75d7df6f5cb3f3af524e944dd47ce4a
2022-03-01 02:47:34 +00:00
Treehugger Robot
675fc37660 Merge "Remove product debug files" am: fb3cdf5fc8 am: 7a8db6594e
Original change: https://android-review.googlesource.com/c/platform/build/+/2002318

Change-Id: I37b05a932ef801543ff1474a7d9ff86eb3123c4a
2022-03-01 02:47:28 +00:00
Treehugger Robot
0e0e961191 Merge "Add to OWNERS for merge tooling." am: 171c1e168e
Original change: https://android-review.googlesource.com/c/platform/build/+/2003097

Change-Id: Iacbe48c697a42b2431932e66c8fd9f0acc8940ab
2022-03-01 02:36:25 +00:00
Treehugger Robot
171c1e168e Merge "Add to OWNERS for merge tooling." 2022-03-01 02:32:17 +00:00
Treehugger Robot
7a8db6594e Merge "Remove product debug files" am: fb3cdf5fc8
Original change: https://android-review.googlesource.com/c/platform/build/+/2002318

Change-Id: I38bdd064b2394e92fb70016820672f0ec23495f4
2022-03-01 02:25:50 +00:00
Colin Cross
a492544a03 Add PLATFORM_DISPLAY_VERSION
Add PLATFORM_DISPLAY_VERSION to version_defaults.mk that will propagate
to the ro.build.version.release_or_preview_display property and
be shown as the Android version for preview releases by Settings.

Bug: 221950960
Test: manual
Change-Id: I697cc59f77f92aa98a8a2573662797e6d3bd2042
2022-02-28 18:01:35 -08:00
Treehugger Robot
fb3cdf5fc8 Merge "Remove product debug files" 2022-03-01 01:57:55 +00:00
paulhu
83f6ef5379 Rename framework-connectivity-tiramisu to framework-connectivity-t
Bug: 215434166
Test: build, flash, device boot to home.
Merged-In: I046503a60f39aa1ec6026c139203b1a1d5a7dab5
Change-Id: I046503a60f39aa1ec6026c139203b1a1d5a7dab5
2022-03-01 01:26:31 +00:00
Daniel Norman
0374741b7b Clean up merge_target_files
Summary of changes:
- Rename extract_items args to be more generic.
- For many other functions, replace large argument lists with
  the OPTIONS shared object.
- Rename process_* functions to merge_* to be more clear about
  the purpose of the function.
- Remove verbose code in merge_ab_partitions_txt().
- Extract certain logic from merge_misc_info_txt() and place it
  into other existing functions: dynamic partition and selinux
  keys are now processed in their own functions.
- Remove verbose code in merge_package_keys_txt().
- Remove verbose code in create_file_contexts_copies().
- Handle extracting from META directly in merge_meta_files(),
  rather than doing this extraction in create_merged_package()
- Storing the set of framework and vendor partitions in OPTIONS
  so it can be reused by multiple functions without needing to
  be parsed again.

Bug: 221858722
Test: atest test_merge_target_files
Test: Use merge_target_files to merge some builds
Change-Id: I8aa429c8fbb05223127b116aab84b2678ac264a8
2022-02-28 16:48:27 -08:00
Cole Faust
e23ae981cc Remove product debug files
These files are difficult to support in the Starlark product
configuration. They also aren't really a good representation
of products even with Makefiles, because they only display
information from products that have been imported with
import-nodes, but generate empty files for the other products
that are included from the imported ones.

For example, lunching aosp_arm64 then running
`m out/products/build/make/target/product/core_64_bit.mk.txt`
would generate a file full of empty variable assignments.

Bug: 221312856
Test: Presubmits
Change-Id: I18613a628968acc25b57b44e229de7df1b2476ef
2022-02-28 14:43:18 -08:00