Commit Graph

8595 Commits

Author SHA1 Message Date
SzuWei Lin
2086575f6f Merge "Support system_dlkm in GSI" am: 576c382c78 am: 2f1130f31e am: 078555ac9a
Original change: https://android-review.googlesource.com/c/platform/build/+/2287293

Change-Id: Ifc8d115dfa217355c2069c6721ccb0f5487a9774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 16:22:54 +00:00
SzuWei Lin
2f1130f31e Merge "Support system_dlkm in GSI" am: 576c382c78
Original change: https://android-review.googlesource.com/c/platform/build/+/2287293

Change-Id: I58467ca9d18848b65ce5dd764ab137bc730216a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 14:51:38 +00:00
SzuWei Lin
8521eca84e Add the path of GSI document in gsi_release.mk
Documents for GSI specific packages can be found at
device/generic/common/README.md.

Bug: 256984997
Test: TH
Change-Id: I62bfeea292050773c9d12cd753357dda836b07b0
2022-11-07 18:13:44 +08:00
SzuWei Lin
1c31b049c9 Support system_dlkm in GSI
From Android 13, all devices must include a system_dlkm partition.
The patch enables system_dlkm on all GSI targets to support the devices
with system_dlkm partition, and be compatible with old devices
without a system_dlkm partition.

With patch, there is no /system/system_dlkm, and add a symlink
/system/lib/modules -> /system_dlkm/lib/modules

Bug: 256984997
Test: make gsi_arm64-user and aosp_arm64-user; check system folder
Change-Id: I2453ec43d584423cc4d5f0e23405f0ae9b6c5c90
2022-11-07 18:13:31 +08:00
Remi NGUYEN VAN
8605443c99 Merge "Add libconnectivity_native to LLNDK" am: 542672d797 am: 92851a2a0f am: 576cb2e9a0
Original change: https://android-review.googlesource.com/c/platform/build/+/2057370

Change-Id: Icdb0cf0cc5813637b681b01a061b8971149a6464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 02:40:54 +00:00
Remi NGUYEN VAN
92851a2a0f Merge "Add libconnectivity_native to LLNDK" am: 542672d797
Original change: https://android-review.googlesource.com/c/platform/build/+/2057370

Change-Id: If0aa00cc386e31e0004083bd1109fc52ab8a1aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 02:08:30 +00:00
Remi NGUYEN VAN
542672d797 Merge "Add libconnectivity_native to LLNDK" 2022-11-07 02:07:45 +00:00
Colin Cross
a2d13276a5 Merge "aosp_riscv64: inherit from default products that don't break the build" am: 9091700e3d am: 7b7af991bc am: 4cd44cd64f
Original change: https://android-review.googlesource.com/c/platform/build/+/2287164

Change-Id: Iefb1fd9a12069742cc5cf6b3881aee388bbb966a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-05 03:46:19 +00:00
Colin Cross
7b7af991bc Merge "aosp_riscv64: inherit from default products that don't break the build" am: 9091700e3d
Original change: https://android-review.googlesource.com/c/platform/build/+/2287164

Change-Id: Ifb94b5e25e2d1cadef2e73379217326282775dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-05 01:15:15 +00:00
Colin Cross
dd9e1e40a3 aosp_riscv64: inherit from default products that don't break the build
Uncomment everything in aosp_riscv64.mk that doesn't break the
aosp_riscv64-userdebug build.

Test: m droid dist
Change-Id: I29b07d74fb8e93848bd422287e9cfaa32bde6d93
2022-11-04 17:25:54 +00:00
Treehugger Robot
c36a95f1a5 Merge "Add init.environ.rc to aosp_riscv64" am: 92716d2d59 am: 70869ab0f2 am: 01753b438a
Original change: https://android-review.googlesource.com/c/platform/build/+/2286573

Change-Id: I1f0a851b1c8b648d7ad228f1cb5037e05cbced23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 05:42:30 +00:00
Treehugger Robot
70869ab0f2 Merge "Add init.environ.rc to aosp_riscv64" am: 92716d2d59
Original change: https://android-review.googlesource.com/c/platform/build/+/2286573

Change-Id: I500b60ea9cf169cd06d8b4e4794a9c39f26fa198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 04:40:02 +00:00
Colin Cross
ceca93acb0 Add init.environ.rc to aosp_riscv64
init.environ.rc has a postinstall command to create the symlinks in
and directories in the root filesystem.  Without those packaging
target-files.zip fails with:
failed to find system in canned fs_config

Bug: 250918230
Test: lunch aosp_riscv64-userdebug && m installclean && m droid dist
Change-Id: Iccb6ba53a3caa918431119230256a01d4919f1cc
2022-11-04 00:22:26 +00:00
Colin Cross
5057ab2347 Merge "Switch from init to init_system to match base_system.mk" am: e2137bae02 am: b67fdb4f94 am: 614681d032
Original change: https://android-review.googlesource.com/c/platform/build/+/2282796

Change-Id: If6f14010454fb3e027bdbf6913e52f5cd7f1e3ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 22:36:04 +00:00
Colin Cross
b67fdb4f94 Merge "Switch from init to init_system to match base_system.mk" am: e2137bae02
Original change: https://android-review.googlesource.com/c/platform/build/+/2282796

Change-Id: If6f65e0508cbbe93b9f006ba1738a92a7a6fa49e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 21:36:00 +00:00
Steven Moreland
99e91c49e8 Merge "graphics.common V3 -> V4" 2022-11-02 21:21:29 +00:00
Colin Cross
2fc08445ac Switch from init to init_system to match base_system.mk
Using init instead of init_system causes a failure packaging
target-files.zip:
failed to find system in canned fs_config

Switching to init_system seems to fix it.

Test: lunch aosp_riscv64-userdebug && m droid dist
Change-Id: Ia2cf2ef1b85c2e63076f70132f2cce64828c5c93
2022-11-02 18:15:08 +00:00
Treehugger Robot
ba7bc4f4df Merge "Hack aosp_riscv64 config to fix m droid dist" am: 324ad55c0a am: 1fc32534d7 am: 73d4032ca5
Original change: https://android-review.googlesource.com/c/platform/build/+/2281222

Change-Id: I8d82aea9b9853eca5bbd5648846cd82a7b60f0c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 04:38:49 +00:00
Treehugger Robot
1fc32534d7 Merge "Hack aosp_riscv64 config to fix m droid dist" am: 324ad55c0a
Original change: https://android-review.googlesource.com/c/platform/build/+/2281222

Change-Id: I3d9a10c5d1eecd6247bc83820d6243bdd99e4fdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 02:56:21 +00:00
Treehugger Robot
c3a9a326b9 Merge "HACK: disable most of the build for riscv64" am: b9b754e19b am: 2fbfed8bdc am: fe07d6d590
Original change: https://android-review.googlesource.com/c/platform/build/+/2281221

Change-Id: I60f8bcd6e80b1543ab9601172ffc5a885f136437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 00:49:14 +00:00
Treehugger Robot
2fbfed8bdc Merge "HACK: disable most of the build for riscv64" am: b9b754e19b
Original change: https://android-review.googlesource.com/c/platform/build/+/2281221

Change-Id: I6c13bbc1392a1fdcff070a93bc82ac3a484240b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 23:34:10 +00:00
Colin Cross
aef92033bc Hack aosp_riscv64 config to fix m droid dist
`m droid dist` fails on hiddenapi rules missing bootclasspath classes,
add default_art_config.mk to set PRODUCT_BOOT_JARS, and then override
PRODUCT_USES_DEFAULT_ART_CONFIG back to false to avoid a dependency
from the boot.zip dist artifact to dex2oat, which doesn't work for
riscv64 yet.

Test: lunch aosp_riscv64-userdebug && m droid dist
Change-Id: Icc332ee9132568251386ec742932f6708312bb92
2022-11-01 16:12:27 -07:00
Colin Cross
f310841384 HACK: disable most of the build for riscv64
Disable most of the inherited product makefiles so that `m droid`
passes, and then add back a few working packages to PRODUCT_PACKAGES.

Test: lunch aosp_riscv64-userdebug && m droid
Change-Id: Ifbc4758735ec29876cbdd5a2ec97dd99aaebc210
2022-11-01 12:08:05 -07:00
Martin Stjernholm
5c29bd36dd Merge "Add allowlist patterns for dexpreopted files." am: e279ae7226 am: dad6ae3cd9 am: 152a88b8ca
Original change: https://android-review.googlesource.com/c/platform/build/+/2267725

Change-Id: I0d86c4922c6edaa3fb26830864560a42429ce249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 14:57:15 +00:00
Martin Stjernholm
dad6ae3cd9 Merge "Add allowlist patterns for dexpreopted files." am: e279ae7226
Original change: https://android-review.googlesource.com/c/platform/build/+/2267725

Change-Id: I0da781c31909b29d05390f8c91ab74014de1ae43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 13:24:30 +00:00
Martin Stjernholm
e279ae7226 Merge "Add allowlist patterns for dexpreopted files." 2022-10-31 11:52:10 +00:00
Dennis Song
0876f3af83 Merge "Add the path of GSI document in gsi_release.mk" am: 70bcc91169 am: 06c00902b0 am: e3c9c5dc52
Original change: https://android-review.googlesource.com/c/platform/build/+/2267203

Change-Id: I20e6bf0b01c1dbff294d60b9c001e26b4101b30b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 03:40:11 +00:00
Dennis Song
06c00902b0 Merge "Add the path of GSI document in gsi_release.mk" am: 70bcc91169
Original change: https://android-review.googlesource.com/c/platform/build/+/2267203

Change-Id: I52ed5e00fc89312b5523c7791fe187caeda8db1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 02:24:16 +00:00
Dennis Song
70bcc91169 Merge "Add the path of GSI document in gsi_release.mk" 2022-10-31 01:35:03 +00:00
Steven Moreland
a0e091108c graphics.common V3 -> V4
Bug: 251177105
Test: builds
Change-Id: I5ed6fbaf18aa1568f3bebf5f46ab31484d386598
2022-10-29 00:54:49 +00:00
Roman Kiryanov
ada0ed43c0 Remove references to device/generic/goldfish/arm32-vendor.mk
this file is not maintained and being retired.

Bug: 250696437
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I6f84ae055014e16ef8af92d77c8db95f714e4182
2022-10-26 17:09:47 -07:00
Motomu Utsumi
b844f8c060 Remove cronet from PRODUCT_PACKAGES
cronet apex is removed and cronet libraries are moved to the tethering
apex

Bug: 251054736
Test: atest CronetApiTest
Change-Id: Id9c5675a708d0382cadc01efcef6b8daf742954f
Merged-In: Ib7a3cd33aaf4f63ccb1fbee926df5f23c29d3b48
2022-10-26 23:20:45 +09:00
Motomu Utsumi
4a68052ffa Remove cronet from PRODUCT_PACKAGES
cronet apex is removed and cronet libraries are moved to the tethering
apex

Bug: 251054736
Test: atest CronetApiTest
Change-Id: Ib7a3cd33aaf4f63ccb1fbee926df5f23c29d3b48
2022-10-26 23:18:24 +09:00
Martin Stjernholm
8787ebe054 Add allowlist patterns for dexpreopted files.
Similar patterns have ended up in other places to work with the
prebuilt ART module, but they belong in ART.

#codehealth

Test: vendor/google/modules/ArtGoogle/build-with-prebuilt-art-module.sh droid
  on internal with prebuilts from mainline_modules on git_master-art
Bug: 238426831
Change-Id: Ice7aaef6a4e8dd04723ec2d7b009eb7e6f35f5d6
2022-10-25 13:49:28 +01:00
Spandan Das
7c354d7708 Merge "Convert check_radio_versions to python3" am: afa0bd4717 am: 58f12a5191 am: 86a96b1a0b
Original change: https://android-review.googlesource.com/c/platform/build/+/2266386

Change-Id: I2386c0f5076f3035467de7ff2818b3a034d85ac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 01:24:59 +00:00
Spandan Das
58f12a5191 Merge "Convert check_radio_versions to python3" am: afa0bd4717
Original change: https://android-review.googlesource.com/c/platform/build/+/2266386

Change-Id: Ife7ae276d6d72a1906caf1bc9c6432a72a2d5a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 00:15:40 +00:00
Spandan Das
ce69e9c812 Convert check_radio_versions to python3
Additionaly,
1. Run it as a python_binary_host so that it uses the hermetic python
toolchain
2. Fix an existing bug where if `board_info_txt` was empty, $^ would
   evaluate to its own path, and it would try to parse the relevant
   configuration from the wrong file

Bug: 196300985
Test: m out/target/product/vsoc_arm64/android-info.txt
Change-Id: Ie1e51a93041591829da4351dd57f37106e15d764
2022-10-24 21:02:00 +00:00
Dennis Song
fe1b534f41 Add the path of GSI document in gsi_release.mk
Documents for GSI specific packages can be found at
device/generic/common/README.md.

Bug: 254392480
Test: Presubmit
Change-Id: I03e9d66462f39c0631dfcbe16902e5978e41c8b6
2022-10-24 11:28:38 +08:00
Amos Bianchi
3a6d4612a8 Merge "Add Device Lock module." 2022-10-21 17:48:58 +00:00
Dennis Song
c1c460f4a3 Merge "Add GSI overlay for SystemUI" am: 8d69e1b7ef am: 978d6503e2 am: 76ee52f3d5
Original change: https://android-review.googlesource.com/c/platform/build/+/2256925

Change-Id: I5f8a70c0cc9c7d88e096cb28c2be2d18edee381a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 09:11:14 +00:00
Pete Bentley
185751b379 Add prng_seeder to base PRODUCT_PACKAGES.
Cherry-pick / Dr No note: Should have been included with
the previous prng_seeder CLs but we missed that it was needed
due to testing on branches without prebuilts.

Needs to be on all (for now) devices with libcrypto, i.e. all
of them.

I failed to learn from https://r.android.com/1305853 that
adding something to Conscrypt's requirements doesn't work if
the module is coming from a prebuilt...

Again, the correct solution here would actually be to make
libcrypto rather than Conscrypt require prng_seeder but Soong
considers that a circular dependency

Bug: 243933553
Test: m installclean && m and verify prng_seeder is installed and running.
Change-Id: Ie34f8c693469eaeedae6a010b956d6c6513a6b15
Merged-In: Ie34f8c693469eaeedae6a010b956d6c6513a6b15
(cherry picked from commit 19b3361a02)
2022-10-21 10:08:13 +01:00
Dennis Song
978d6503e2 Merge "Add GSI overlay for SystemUI" am: 8d69e1b7ef
Original change: https://android-review.googlesource.com/c/platform/build/+/2256925

Change-Id: I66586a287bea9c3503ea153d8226d97b84d663d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 08:10:52 +00:00
Dennis Song
8d69e1b7ef Merge "Add GSI overlay for SystemUI" 2022-10-21 07:37:42 +00:00
Amos Bianchi
3a78a17f3b Add Device Lock module.
Bug: b/241442337
Test: service successfully starts
Test: atest DeviceLockUnitTests
Test: cts-tradefed run cts -m CtsDeviceLockTestCases

Change-Id: Ie0a7ed87dd3f986859f3dc6e550337a2d44ae351
2022-10-20 22:50:17 -07:00
Colin Cross
9670678136 Merge "Set ALLOW_MISSING_DEPENDENCIES=true in generic_riscv64/BoardConfig.mk" am: a1920a2f2e am: 2924a99857 am: 794719e812
Original change: https://android-review.googlesource.com/c/platform/build/+/2263925

Change-Id: Id8eb10ab8ce78353a17e4c10b4684a51a001243a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 02:12:56 +00:00
Colin Cross
2924a99857 Merge "Set ALLOW_MISSING_DEPENDENCIES=true in generic_riscv64/BoardConfig.mk" am: a1920a2f2e
Original change: https://android-review.googlesource.com/c/platform/build/+/2263925

Change-Id: I875800761ba11ef19093bff2dce182e90d8e496c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 00:59:52 +00:00
Colin Cross
a1920a2f2e Merge "Set ALLOW_MISSING_DEPENDENCIES=true in generic_riscv64/BoardConfig.mk" 2022-10-21 00:35:39 +00:00
Treehugger Robot
ee32acdb60 Merge "Add prng_seeder to base PRODUCT_PACKAGES." am: a911c507dd am: c3024b6af3 am: 042850334b
Original change: https://android-review.googlesource.com/c/platform/build/+/2263521

Change-Id: Ib860de19438243e71ae746cdfd96a3041173438a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-20 22:46:52 +00:00
Colin Cross
a098e96018 Set ALLOW_MISSING_DEPENDENCIES=true in generic_riscv64/BoardConfig.mk
Building for riscv64 without ALLOW_MISSING_DEPENDENCIES=true fails
on prebuilt modules that are missing riscv64 files.  Set
ALLOW_MISSING_DEPENDENCIES=true in BoardConfig.mk for now to avoid
always having to set it on the command line.

Test: lunch aosp_riscv64-userdebug && m ndk_sysroot
Change-Id: I6b7dcf684b59d073cb6e257717946d551aefdb44
2022-10-20 14:04:21 -07:00
Treehugger Robot
c3024b6af3 Merge "Add prng_seeder to base PRODUCT_PACKAGES." am: a911c507dd
Original change: https://android-review.googlesource.com/c/platform/build/+/2263521

Change-Id: Ic95f252ad052e0d2167340f0bc1f6bcfeb7547d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-20 21:03:42 +00:00