Commit graph

74520 commits

Author SHA1 Message Date
Cole Faust
547ca205ae Convert generate-self-extracting-archive.py to python 3
Test: Add a VENDOR_BLOBS_LICENSE entry to an existing product, then `m with-license`
Bug: 203436762
Change-Id: I4bbe77bda7789b6c44bea141518b1cd2e699d326
2021-12-29 13:58:28 -08:00
Treehugger Robot
a5726efd0a Merge "Re-landing "removing gsi_keys.mk"" am: 8c861cec97 am: 87d6967714 am: 6c73a8ae5f
Original change: https://android-review.googlesource.com/c/platform/build/+/1931644

Change-Id: Ib52aaa3d34f06e5b744148cffc8f402d93d34449
2021-12-27 03:48:05 +00:00
Treehugger Robot
6c73a8ae5f Merge "Re-landing "removing gsi_keys.mk"" am: 8c861cec97 am: 87d6967714
Original change: https://android-review.googlesource.com/c/platform/build/+/1931644

Change-Id: I361cd63a88c88c52b3cb71fa4ef712cfe5cfe3cb
2021-12-27 03:33:19 +00:00
Treehugger Robot
87d6967714 Merge "Re-landing "removing gsi_keys.mk"" am: 8c861cec97
Original change: https://android-review.googlesource.com/c/platform/build/+/1931644

Change-Id: I5166c67417fd03ea1c77a7015f9413c7c2596cba
2021-12-27 03:09:46 +00:00
Treehugger Robot
8c861cec97 Merge "Re-landing "removing gsi_keys.mk"" 2021-12-27 02:50:48 +00:00
Treehugger Robot
886bf936c3 Merge "--sign_tool is an optional flag applicable to virtApex." am: ff3a1c73cf am: aabf327615 am: 676de41c33
Original change: https://android-review.googlesource.com/c/platform/build/+/1933021

Change-Id: Ib2970dad7609dbe500df528cdec867b7549f8fbf
2021-12-24 12:02:02 +00:00
Treehugger Robot
676de41c33 Merge "--sign_tool is an optional flag applicable to virtApex." am: ff3a1c73cf am: aabf327615
Original change: https://android-review.googlesource.com/c/platform/build/+/1933021

Change-Id: If3fb5c7ab8c9301f3d5875a88559a317dd741549
2021-12-24 11:39:35 +00:00
Treehugger Robot
aabf327615 Merge "--sign_tool is an optional flag applicable to virtApex." am: ff3a1c73cf
Original change: https://android-review.googlesource.com/c/platform/build/+/1933021

Change-Id: I121cb833348795c7dc64ef774456da8e171fb5bc
2021-12-24 11:22:08 +00:00
Treehugger Robot
ff3a1c73cf Merge "--sign_tool is an optional flag applicable to virtApex." 2021-12-24 10:59:21 +00:00
Baligh Uddin
06cc018629 --sign_tool is an optional flag applicable to virtApex.
For not virtApex, this results in a KeyError.
line 151, in <module>\n', '  File
"/usr/local/google/home/baligh/clients/goog/master/out/host/linux-x86/bin/sign_apex/sign_apex.py",
line 144, in main\n', "KeyError: 'sign_tool'\n"]

BUG: 193504286
Test: TH
Change-Id: Id982e5c57086ada78168163d2293813df121847d
2021-12-24 06:17:47 +00:00
Bowgo Tsai
b30a23cca2 Re-landing "removing gsi_keys.mk"
It's no longer required to install the compliance GSI
public keys into the ramdisk. Those public keys just need
to be included in the VTS test suite for GSI verification.

Bug: 176869478
Test: TreeHugger
Change-Id: I3714de75b94be43a1364b89b92d893b336aa014b
2021-12-24 12:28:32 +08:00
Jiyong Park
d74b22ab84 [automerger skipped] Merge "Reland: Add NEED_AIDL_NDK_PLATFORM_BACKEND" into sc-qpr1-dev-plus-aosp am: 7563ad7b11 -s ours
am skip reason: Merged-In Iba8633263ae649af783e94b01f5c1b5c6e042948 with SHA-1 93c5a901a7 is already in history

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

Change-Id: I2658e94ad12d74e2fc880b7b31482bc3bd72cceb
2021-12-24 02:58:21 +00:00
Jiyong Park
7563ad7b11 Merge "Reland: Add NEED_AIDL_NDK_PLATFORM_BACKEND" into sc-qpr1-dev-plus-aosp 2021-12-24 02:34:34 +00:00
Steven Moreland
15b89d8fcd Don't require current.txt order.
There have been a lot of merge conflicts because of this file (and a
few cases of people needing to merge changes internally because of
it). Though, we really don't care about the order of the file. So,
compare ignoring order. If there is a merge conflict in the future,
we can change the order slightly, and we can gradually clean up the
order over time, as needed (really, it's not important).

Bug: N/A
Test: file reordered as build-time check
Change-Id: I955a2bd78872ff6d975bc494f10b2ed5e532c680
2021-12-23 22:18:42 +00:00
Jared Duke
9c261d0b07 Add Soong variable for optimizing SystemUI Java
Introduce a Soong variable to allow selective enabling of Java
optimizations for SystemUI. This is analogous to the
`SYSTEM_OPTIMIZE_JAVA` flag, but scoped just to SystemUI,
decoupling the feature from system server-related development.

Opting in to optimizations can be achieved with either:
  * Env:
export SYSTEMUI_OPTIMIZE_JAVA=true
  * Make:
$(call add_soong_config_var_value,ANDROID,SYSTEMUI_OPTIMIZE_JAVA,true)

Note that the build rule changes to hook into this variable will
land separately.

Bug: 203088572
Test: `SYSTEMUI_OPTIMIZE_JAVA=true m` (observe env variable change log)
Change-Id: I24b4b76cdf844e3c00735e19e69898867162c81d
2021-12-23 09:29:30 -08:00
Devin Moore
fa9ffed08d Merge changes from topic "init_boot_img" am: 6363a04e79 am: 1368d81efa am: 2bc48d1025
Original change: https://android-review.googlesource.com/c/platform/build/+/1920818

Change-Id: I2624bc5a38be1c5742e2b80c3de916e22b526415
2021-12-23 00:13:10 +00:00
Devin Moore
2bc48d1025 Merge changes from topic "init_boot_img" am: 6363a04e79 am: 1368d81efa
Original change: https://android-review.googlesource.com/c/platform/build/+/1920818

Change-Id: Ibca1c0c3105c0d2ee53f7db6795ac567a17a0269
2021-12-22 23:56:55 +00:00
Devin Moore
1368d81efa Merge changes from topic "init_boot_img" am: 6363a04e79
Original change: https://android-review.googlesource.com/c/platform/build/+/1920818

Change-Id: Ib49ac64a178ce649011a20709e44c8f1f4837bb4
2021-12-22 23:33:33 +00:00
Devin Moore
6363a04e79 Merge changes from topic "init_boot_img"
* changes:
  Update releasetools for new init_boot.img
  Build a new init_boot.img that contains the boot ramdisk
2021-12-22 23:21:17 +00:00
Treehugger Robot
b3e1308797 Merge "Update comments for Makefile variables about APEX jars." am: e685560087 am: 3cc272c031 am: dbe5fcc828
Original change: https://android-review.googlesource.com/c/platform/build/+/1931602

Change-Id: I6418516104d706c25cc27cc7cca5a46016d6af05
2021-12-22 19:37:54 +00:00
Treehugger Robot
dbe5fcc828 Merge "Update comments for Makefile variables about APEX jars." am: e685560087 am: 3cc272c031
Original change: https://android-review.googlesource.com/c/platform/build/+/1931602

Change-Id: I77c3c8e180d1134db2cf86010954c16e1870d85e
2021-12-22 19:19:19 +00:00
Treehugger Robot
3cc272c031 Merge "Update comments for Makefile variables about APEX jars." am: e685560087
Original change: https://android-review.googlesource.com/c/platform/build/+/1931602

Change-Id: I11bff7adff7233683daa605bfc9c34d0d6cfcaf6
2021-12-22 18:54:20 +00:00
Treehugger Robot
e685560087 Merge "Update comments for Makefile variables about APEX jars." 2021-12-22 18:37:28 +00:00
Treehugger Robot
eabf1e38fa Merge "Fix make conditional" am: 3e315b9afc am: b5560e2fc4 am: f2bf87a8ff
Original change: https://android-review.googlesource.com/c/platform/build/+/1931200

Change-Id: Ic8317970e60153b6b92747e8fb12b658bd0e8150
2021-12-22 18:33:36 +00:00
Treehugger Robot
f2bf87a8ff Merge "Fix make conditional" am: 3e315b9afc am: b5560e2fc4
Original change: https://android-review.googlesource.com/c/platform/build/+/1931200

Change-Id: I41dcc99125aa10d800c9df8cf83f308b085747d4
2021-12-22 18:23:08 +00:00
Treehugger Robot
b5560e2fc4 Merge "Fix make conditional" am: 3e315b9afc
Original change: https://android-review.googlesource.com/c/platform/build/+/1931200

Change-Id: I3a1ef516c731fa3fa3841a5a652bf2468c94c6cf
2021-12-22 18:11:07 +00:00
Treehugger Robot
3e315b9afc Merge "Fix make conditional" 2021-12-22 17:53:54 +00:00
Jiakai Zhang
49377db572 Update comments for Makefile variables about APEX jars.
Modules available in Q should not add new entries to
PRODUCT_APEX_*_JARS. Otherwise, there will be problems when a Q device
gets new modules and then OTAs to S, in which case, the device will have
the S version of SdkExtension (because SdkExtension is not available in
Q, see go/mainline-ota-problem), and the S version of SdkExtension
cannot consume those new entries correctly.

Bug: 203198541
Test: N/A
Change-Id: I15367ca59a06b4ee5fdb3803f2e4615b5d03b458
2021-12-22 13:38:17 +00:00
Ayush Sharma
adce3569a8 Merge "Revert "Removing gsi_keys.mk"" am: 9d68bcd762 am: 59e76276de am: f1974fe82c
Original change: https://android-review.googlesource.com/c/platform/build/+/1931081

Change-Id: I0fd6ca573b07929d8d9381973aba9ac7d0c160ab
2021-12-22 13:09:35 +00:00
Ayush Sharma
f1974fe82c Merge "Revert "Removing gsi_keys.mk"" am: 9d68bcd762 am: 59e76276de
Original change: https://android-review.googlesource.com/c/platform/build/+/1931081

Change-Id: I7ea72162f32a0da0f81d15804892bf9b47c21738
2021-12-22 12:55:04 +00:00
Ayush Sharma
59e76276de Merge "Revert "Removing gsi_keys.mk"" am: 9d68bcd762
Original change: https://android-review.googlesource.com/c/platform/build/+/1931081

Change-Id: I271c0e090a50e9677dbef558c75b1b8c397b43a0
2021-12-22 12:24:04 +00:00
Ayush Sharma
9d68bcd762 Merge "Revert "Removing gsi_keys.mk"" 2021-12-22 12:08:53 +00:00
Ayush Sharma
0ab9187f01 Revert "Removing gsi_keys.mk"
This reverts commit 5d2cf578d6.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_sc-qpr1-dev-plus-aosp&target=build_test3&lkgb=8021524&lkbb=8021634&fkbb=8021569, bug https://buganizer.corp.google.com/issues/211737534

Bug: 211737534
Change-Id: I40e8dce5d87a1ba08a6f100fc2af92dd94fd2d5c
2021-12-22 11:56:11 +00:00
Treehugger Robot
56300eb6bd Merge "Removing gsi_keys.mk" am: 09d30489b3 am: 139a73dcc0 am: b350bf36ac
Original change: https://android-review.googlesource.com/c/platform/build/+/1928391

Change-Id: I97ba7994007904eb39baa8e5a479aced75307b5b
2021-12-22 10:30:08 +00:00
Treehugger Robot
b350bf36ac Merge "Removing gsi_keys.mk" am: 09d30489b3 am: 139a73dcc0
Original change: https://android-review.googlesource.com/c/platform/build/+/1928391

Change-Id: I1e4738bee330e96b23ffa639dbc20b2dca652d75
2021-12-22 10:14:21 +00:00
Treehugger Robot
139a73dcc0 Merge "Removing gsi_keys.mk" am: 09d30489b3
Original change: https://android-review.googlesource.com/c/platform/build/+/1928391

Change-Id: Ib1fe98216ba4103e68b0d962034e0fde8796fda8
2021-12-22 09:48:23 +00:00
Treehugger Robot
09d30489b3 Merge "Removing gsi_keys.mk" 2021-12-22 09:27:55 +00:00
Treehugger Robot
90c9ad6f8b Merge "Fix some python2/3 migration issues" am: ceb81e2bef am: fa3f8bdd90 am: 949f4fc6b6
Original change: https://android-review.googlesource.com/c/platform/build/+/1930407

Change-Id: I0b36d8974c2a864ae01269aafeacf304cecd7581
2021-12-22 07:04:48 +00:00
Treehugger Robot
17a941e0d3 Merge changes I8d60efc5,Ie291ea87 am: 01ca0d0c5e am: 6a4a3d0ed7 am: 2cbdab25ed
Original change: https://android-review.googlesource.com/c/platform/build/+/1900893

Change-Id: Ib0569bf7284efb08c75726a5479574f065c6e29e
2021-12-22 07:04:39 +00:00
Treehugger Robot
949f4fc6b6 Merge "Fix some python2/3 migration issues" am: ceb81e2bef am: fa3f8bdd90
Original change: https://android-review.googlesource.com/c/platform/build/+/1930407

Change-Id: I25547cf5d49e9cfb796fac5f039b0ba2f1513701
2021-12-22 06:53:46 +00:00
Treehugger Robot
2cbdab25ed Merge changes I8d60efc5,Ie291ea87 am: 01ca0d0c5e am: 6a4a3d0ed7
Original change: https://android-review.googlesource.com/c/platform/build/+/1900893

Change-Id: Ic954a4f26ff1508d6b1c79922bd1f5ae5e9d2f4a
2021-12-22 06:53:36 +00:00
Treehugger Robot
fa3f8bdd90 Merge "Fix some python2/3 migration issues" am: ceb81e2bef
Original change: https://android-review.googlesource.com/c/platform/build/+/1930407

Change-Id: I975554291fe32041297a1249dd9ff11e37387f5f
2021-12-22 06:36:45 +00:00
Treehugger Robot
6a4a3d0ed7 Merge changes I8d60efc5,Ie291ea87 am: 01ca0d0c5e
Original change: https://android-review.googlesource.com/c/platform/build/+/1900893

Change-Id: I0f7f932dd81dfd5c12e0861fb6d147efa28c90bc
2021-12-22 06:36:35 +00:00
Treehugger Robot
ceb81e2bef Merge "Fix some python2/3 migration issues" 2021-12-22 06:33:32 +00:00
Treehugger Robot
01ca0d0c5e Merge changes I8d60efc5,Ie291ea87
* changes:
  SignApk - change signature of readPassword to use char[] instead
  SignApk - use existing password mechanism when using keystore
2021-12-22 06:23:19 +00:00
Bowgo Tsai
5d2cf578d6 Removing gsi_keys.mk
It's no longer required to install the compliance GSI
public keys into the ramdisk. Those public keys just need
to be included in the VTS test suite for GSI verification.

Bug: 176869478
Test: TreeHugger
Change-Id: I26c4a1c7dba28a3c8cf88af64d8539fdc23a4f28
2021-12-22 13:11:32 +08:00
Treehugger Robot
fcf7cd2d05 Merge "Update comment up to date" am: cf7300e9c2 am: a93b9ff575 am: ba37412ac7
Original change: https://android-review.googlesource.com/c/platform/build/+/1928383

Change-Id: I3c6ac4664d10a2e973bde13e72a5d3a42d7f5a39
2021-12-22 01:35:08 +00:00
Treehugger Robot
ba37412ac7 Merge "Update comment up to date" am: cf7300e9c2 am: a93b9ff575
Original change: https://android-review.googlesource.com/c/platform/build/+/1928383

Change-Id: Iedf39242d7346ace096f2419ae38200ddf259d20
2021-12-22 01:18:29 +00:00
Treehugger Robot
a93b9ff575 Merge "Update comment up to date" am: cf7300e9c2
Original change: https://android-review.googlesource.com/c/platform/build/+/1928383

Change-Id: I9bc579a9956b59a35dc97ab901aa2c9bc696f642
2021-12-22 01:06:23 +00:00
Treehugger Robot
cf7300e9c2 Merge "Update comment up to date" 2021-12-22 00:38:22 +00:00