Commit Graph

73346 Commits

Author SHA1 Message Date
Treehugger Robot
ecf39825f0 Merge "Convert generate-self-extracting-archive.py to python 3" am: 7ca77ea994
Original change: https://android-review.googlesource.com/c/platform/build/+/1935067

Change-Id: I0ecbc11985f863f5e07b5ddce60f0d2ec21bca9c
2022-01-05 19:14:17 +00:00
Treehugger Robot
7ca77ea994 Merge "Convert generate-self-extracting-archive.py to python 3" 2022-01-05 18:58:58 +00:00
Devin Moore
ba7dcae84b Merge "Add prebuilt init_boot.img to PREBUILT_IMAGES/" am: 1c33419ed0
Original change: https://android-review.googlesource.com/c/platform/build/+/1936571

Change-Id: I01cc13d6fa40602cc52ad06ee38edcdbd29bd788
2022-01-05 17:34:45 +00:00
Devin Moore
1c33419ed0 Merge "Add prebuilt init_boot.img to PREBUILT_IMAGES/" 2022-01-05 17:22:17 +00:00
Treehugger Robot
af48f4be53 Merge "Remove GKI_SIGNING args from recovery & debug boot image build rules" am: 5203f2b1e0
Original change: https://android-review.googlesource.com/c/platform/build/+/1934208

Change-Id: I6864296552846e9fc85d807c62fb12b613b3fa15
2022-01-05 17:16:07 +00:00
Treehugger Robot
5203f2b1e0 Merge "Remove GKI_SIGNING args from recovery & debug boot image build rules" 2022-01-05 17:00:26 +00:00
Yi-Yo Chiang
cd6de3d8bb Remove GKI_SIGNING args from recovery & debug boot image build rules
These options are for certifying official GKI release, so they should
never be added to build command of recovery.img and boot-debug.img.

Also define gki_signing_signature_args in misc_info.txt iff.
BOARD_GKI_SIGNING_KEY_PATH is defined, so there's one less conditional.
We need to define it even if BOARD_GKI_SIGNING_SIGNATURE_ARGS is empty,
so that sign_target_files_apks.py can modify the option during image
signing.

Bug: 210367929
Test: Presubmit
Change-Id: I9546fcda796586d97af244955e15c1b8dc9f6d92
2022-01-05 02:59:45 +00:00
Treehugger Robot
a2b19d4e51 Merge "Fix images-for-partitions() for 'init_boot'" am: 8beddf2e7e
Original change: https://android-review.googlesource.com/c/platform/build/+/1934174

Change-Id: Ib09c4b73cdcc1b4da56161f37b7dd8bdf4f029d0
2022-01-05 01:34:10 +00:00
Treehugger Robot
8beddf2e7e Merge "Fix images-for-partitions() for 'init_boot'" 2022-01-05 01:21:00 +00:00
Devin Moore
cda41f0709 Add prebuilt init_boot.img to PREBUILT_IMAGES/
It was incorrectly being added to IMAGES/

Bug: 203698939
Test: m
Change-Id: I3c4ae46388a7f043c7bb22b78795277868422a01
2022-01-05 00:22:55 +00:00
Treehugger Robot
eeb0c000b6 Merge "Add Soong variable for optimizing SystemUI Java" am: 3293a959ad
Original change: https://android-review.googlesource.com/c/platform/build/+/1931304

Change-Id: I47784b38692b7ae11fc433eefbca6fee636abd1c
2022-01-04 18:55:59 +00:00
Treehugger Robot
3293a959ad Merge "Add Soong variable for optimizing SystemUI Java" 2022-01-04 18:40:09 +00:00
Bowgo Tsai
4f62aa0899 Fix images-for-partitions() for 'init_boot'
Macro images-for-partitions() returns $(INSTALLED_INIT_BOOTIMAGE_TARGET)
for the 'init_boot' partition, which is empty. It should return
$(INSTALLED_INIT_BOOT_IMAGE_TARGET) instead.

Bug: 203698939
Test: `make` without chaining 'init_boot' partition
Change-Id: I387813283dfad7e1b2f762a5fa4065775977caf7
2022-01-04 17:29:03 +08:00
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
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
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
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
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
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
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
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
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
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
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
Dan Willemsen
1637c37d21 Fix make conditional
`ifeq (foo,foo,)` is treated like `foo == foo,` which is not what we
want here, we want to clear this variable for user builds.

Change-Id: I57f92c7267102c9f3ac2b0130228de0b3036ac66
2021-12-21 21:54:19 +00:00
Kelvin Zhang
0d0ca5d6a0 Fix some python2/3 migration issues
Exception objects don't necessarily have a .message member, use str()
instead.

Test: th
Change-Id: I57b68dff1ace4937d6ef3b7c564f031e219491b1
2021-12-21 12:31:55 -08:00
Inseob Kim
f6e08dcf68 Merge "Add sepolicy prebuilt dirs and variables to config" am: f6e4b7b769
Original change: https://android-review.googlesource.com/c/platform/build/+/1926906

Change-Id: I65073069527242c153e01871b0d834cbcf3dfb5d
2021-12-21 07:20:17 +00:00
Inseob Kim
f6e4b7b769 Merge "Add sepolicy prebuilt dirs and variables to config" 2021-12-21 07:09:58 +00:00
Inseob Kim
e7b222aa9e Update comment up to date
nonplat* is renamed to vendor*.

Bug: 210536608
Test: N/A
Change-Id: Ief699bf11395a5b0d9bee22220c09acac6e450f2
2021-12-21 15:57:03 +09:00
Xin Li
bda6a28874 Merge "Merge SP1A.211205.008" am: 3aec887b7e
Original change: https://android-review.googlesource.com/c/platform/build/+/1930700

Change-Id: I89ad49f820c4ed39d40a479f7f586df967f68403
2021-12-21 05:21:39 +00:00
Xin Li
3aec887b7e Merge "Merge SP1A.211205.008" 2021-12-21 05:02:44 +00:00
Treehugger Robot
e5a33f0723 Merge "Add symlink for system_dlkm modules" am: 7dac6abb9a
Original change: https://android-review.googlesource.com/c/platform/build/+/1906557

Change-Id: I787321bc38a72cfda4caa9d520a520e113501856
2021-12-21 01:22:40 +00:00
Treehugger Robot
7dac6abb9a Merge "Add symlink for system_dlkm modules" 2021-12-21 01:02:38 +00:00
Inseob Kim
bfe25fe702 Add sepolicy prebuilt dirs and variables to config
These are used when we build vendor sepolicy against old plat sepolicy.

Bug: 33691272
Test: build
Change-Id: I847108539b3b9d7d25c0fad9eddc017275a564be
2021-12-21 09:50:22 +09:00