Commit Graph

73484 Commits

Author SHA1 Message Date
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
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
weisu
eae45315cd Write files in a temporary directory
Avoid writing test files in the build output directory which fails when
run with Bazel. This happens because Bazel's sandboxing environment
ensures that the test's working directory is unwritable.

See https://docs.bazel.build/versions/main/sandboxing.html for more
information.

Bug: 209687942
Test: atest --bazel-mode zipalign_tests
Test: atest zipalign_tests

Change-Id: Ie22f464830c1ffe4d38a94a16dbd39dafa7fe317
2021-12-22 00:06:14 +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
Xin Li
90df2b43bc Merge SP1A.211205.008
Bug: 205056467
Merged-In: Ic0dabce4beb09bdd966152c059730677ca5bf5aa
Change-Id: Ic9d5fe40d265ef8002ccbcf3182a2fb8b6239135
2021-12-20 14:07:52 -08:00
Devin Moore
afdd7c74bc Update releasetools for new init_boot.img
This new init_boot.img contains the ramdisk that used to reside in the
boot.img file.

Test: set BOARD_PREBUILT_INIT_BOOT_IMAGE to an external init_boot.img
      - Check that "m" pulls in the init_boot.img to
      out/target/product/vsoc_x86_64/
      - Check that "m dist" adds the init_boot.img to
      aosp_cf_x86_64_phone-img-eng.devinmoore.zip
Test: atest --host releasetools_test
Bug: 203698939
Change-Id: If7ef2cf093e5e525529c7c44333c0f40f6ba0764
2021-12-20 20:54:23 +00:00
Devin Moore
380d9e445c Build a new init_boot.img that contains the boot ramdisk
This ramdisk used to be in boot.img, and is now placed into this new
init_boot.img instead.
This new image is used for a new init parition to seperate Android
platform artifacts from the kernel artifacts in boot.img.

Test: boot Cuttlefish
Bug: 203698939

Change-Id: Iaaf82486259979ab728730ce72a4e847ae005c18
2021-12-20 20:54:14 +00:00
Ramji Jiyani
f9ce357613 Add symlink for system_dlkm modules
Create symlinks for system_dlkm on devices with a
system_dlkm partition:

/system/lib/modules -> /system_dlkm/lib/modules

Bug: 200082547
Test: Manual boot with CF
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I8ddf340425cf92aa234f93f6b31bfd51cfa9c3f3
2021-12-20 19:52:40 +00:00
Cole Faust
a16a17ea84 Merge "Export words function" am: bd99de67c6
Original change: https://android-review.googlesource.com/c/platform/build/+/1917219

Change-Id: I4407e14bea02461ca1d11c6436f30c633c246131
2021-12-16 21:22:08 +00:00
Cole Faust
bd99de67c6 Merge "Export words function" 2021-12-16 21:16:49 +00:00
Treehugger Robot
06665ff87f Merge "Preserve all COMPATIBILITY_SUITES values in module-info" am: 32085e7bd7
Original change: https://android-review.googlesource.com/c/platform/build/+/1913437

Change-Id: Icf9149a4fe8210e941d70453e20c5cd936c30d61
2021-12-16 01:54:55 +00:00
Treehugger Robot
32085e7bd7 Merge "Preserve all COMPATIBILITY_SUITES values in module-info" 2021-12-16 01:29:59 +00:00
Treehugger Robot
608be6d592 Merge "Update vndk list with dice hal libraries." am: 06c7e31f01
Original change: https://android-review.googlesource.com/c/platform/build/+/1906731

Change-Id: I2c8f6c04cf534204854b6884301d5270998af7fe
2021-12-16 00:43:52 +00:00
Treehugger Robot
06c7e31f01 Merge "Update vndk list with dice hal libraries." 2021-12-16 00:16:45 +00:00
Cole Faust
c7077a8abd Merge "Create $(findstring) starlark implementation" am: 12beaaf4ac
Original change: https://android-review.googlesource.com/c/platform/build/+/1921319

Change-Id: Ia0c7f1283732e6f3368fc2fc3680d85978e6fc29
2021-12-15 21:36:08 +00:00
Gabriel Biren
ac3f304f30 Merge "Add Wifi supplicant AIDL interface support." am: 23e4ccd2ba
Original change: https://android-review.googlesource.com/c/platform/build/+/1859994

Change-Id: Ia0cb778a73550d61ea1f1580f546d73856e22d04
2021-12-15 21:35:42 +00:00
Cole Faust
12beaaf4ac Merge "Create $(findstring) starlark implementation" 2021-12-15 21:32:27 +00:00
Gabriel Biren
23e4ccd2ba Merge "Add Wifi supplicant AIDL interface support." 2021-12-15 21:13:41 +00:00
Inseob Kim
7cc500615e Merge changes I6f61a908,Iafd22881 am: 32961d0203
Original change: https://android-review.googlesource.com/c/platform/build/+/1922320

Change-Id: I19494a973460498f4e08dd6e3da0ec5ee93726f9
2021-12-15 07:33:00 +00:00
Inseob Kim
32961d0203 Merge changes I6f61a908,Iafd22881
* changes:
  fsverity_metadata: Support PEM key
  Add fsverity_metadata_generator helper binary
2021-12-15 06:03:31 +00:00
Inseob Kim
067492988a fsverity_metadata: Support PEM key
When we have a PEM key, we don't need the process converting a DER key
to PEM format, but we just need to use the PEM key as-is.

Bug: 205987437
Test: build and manual test
Change-Id: I6f61a9088efc0f7193737d3c33b8cfde399b2b6f
2021-12-15 09:41:39 +09:00
Inseob Kim
2d03493341 Add fsverity_metadata_generator helper binary
Making this a host tool will help users generate their own fsverity
metadata easily.

Bug: 205987437
Test: m fsverity_metadata_generator and run it
Change-Id: Iafd228815a74d298d87ca1466c6909c0d24c5874
2021-12-15 09:41:29 +09:00