Commit Graph

8190 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Pete Bentley
19b3361a02 Add prng_seeder to base PRODUCT_PACKAGES.
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
2022-10-20 18:42:35 +01:00
Treehugger Robot
4eab59ebb9 Merge "Retire compatibility_matrix.xml in goldfish" am: 434295ceb5
Original change: https://android-review.googlesource.com/c/platform/build/+/2261202

Change-Id: I78b7d697eeab57683b875f572ecd61f45fb86124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 16:24:01 +00:00
Roman Kiryanov
09741e4e4d Retire compatibility_matrix.xml in goldfish
not required

Bug: 250696437
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I3dc983e829613daabbc836bea3e0e26af632a25d
2022-10-18 13:54:05 -07:00
Devin Moore
0c007b0b5c Merge "Don't install omx service by default on new devices" am: cd91bec2ca
Original change: https://android-review.googlesource.com/c/platform/build/+/2254788

Change-Id: I17a75fd2885e0a3402d03576350ccab92393e928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17 16:08:16 +00:00
Devin Moore
cd91bec2ca Merge "Don't install omx service by default on new devices" 2022-10-17 15:21:31 +00:00
Dennis Song
a0f242ae87 Add GSI overlay for SystemUI
Use runtime resource overlay to override SystemUI resources
in case some legacy devices might have invalid settings,
and the invalid settings might cause unexpected SystemUI
errors when installing GSI on different devices.

Bug: 245806899
Test: Build and install GSI on Pixel
Change-Id: I704ba8f1a4a1d058e5e992d3ca18bdb4bda6610d
2022-10-17 16:42:16 +08:00
Devin Moore
a835eb9810 Don't install omx service by default on new devices
On devices launching after Android U, we no longer install the HIDL OMX
service. It is deprecated.

Test: Build and run Cuttlefish with SHIPING_API_LEVEL 33 and 34
Bug: 218588089
Change-Id: I9a6dbffd381bdad5428e9c365bd50445a9b14a67
2022-10-14 15:51:49 +00:00
Yi-yo Chiang
e91b6dad06 Merge "Add virt APEX to arm64 & x86_64 GSI" am: f6eab1f608
Original change: https://android-review.googlesource.com/c/platform/build/+/2249053

Change-Id: I04ff1e2a86e7674059dafd19c7aea8bc61de4fda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-14 05:40:54 +00:00
Yi-Yo Chiang
595a0f7c20 Add virt APEX to arm64 & x86_64 GSI
Bug: 252441099
Test: Install GSI (MASTER) on Pixel 6a (TM) && fastboot oem pkvm enable
Test: atest VirtualizationTestCases.64
Test: atest MicrodroidHostTestCases
Test: atest MicrodroidTestApp
Change-Id: Iad14c8627e2807ef5ab2930ba9ed3626c77f9aa7
2022-10-13 17:19:01 +08:00
Xin Li
1c3ae20645 Merge tm-qpr-dev-plus-aosp-without-vendor@9129937
Bug: 248070379
Merged-In: I592acf9a3868e2a60e203b2201e7fadcbb0e7f04
Change-Id: Ia67b109e76eea8167961bf525ee29957cc7264de
2022-10-06 12:02:16 -07:00
Colin Cross
a4e13d8866 Merge "Add initial files for aosp_riscv64 target" 2022-10-05 22:03:22 +00:00
Colin Cross
dac728895d Add initial files for aosp_riscv64 target
Add barebones files to support building for a riscv64 target.

Bug: 250918230
Test: lunch aosp_riscv64-userdebug && m ALLOW_MISSING_DEPENDENCIES=true nothing
Change-Id: I61e6ecf6706b7682c77b07e6593d78c7d1eaef39
2022-10-05 12:04:31 -07:00
Treehugger Robot
694cb51d7e Merge "Also copy init.zygote64.rc for 64-bit primary 32-bit secondary targets." 2022-10-04 21:14:37 +00:00
Peter Collingbourne
58a7f29c21 Also copy init.zygote64.rc for 64-bit primary 32-bit secondary targets.
Bug: 250705777
Change-Id: I59563d4907bb91fcdb17dbe5d687411cf8be7031
2022-10-04 11:31:57 -07:00
Roman Kiryanov
d9bbd880fd Retire emulator.mk
use emulator_vendor.mk instead

Bug: 250696437
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ib770efb32fdf014d8ffa20ec34485d3235036a4a
2022-10-04 10:34:36 -07:00
Sandro Montanari
489181f360 Merge "Rollback "Make com.android.sepolicy mandatory"" am: 1bcc569e14 am: 152c8ffb55 am: b4093a65c2 am: 72d96fe42a
Original change: https://android-review.googlesource.com/c/platform/build/+/2215049

Change-Id: I85fb69a49edf8cc13e3cb733cb6032cbb649582d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 10:39:30 +00:00
Sandro
d571ca6d4a Rollback "Make com.android.sepolicy mandatory"
Rolling back the changes from aosp/2199179.

Bug: 243923977#comment9
Test: adb shell ls /dev/selinux /system/etc/selinux
Change-Id: If205f106230c2f076f72396011b68079ddd4d253
2022-09-26 11:49:30 +00:00
Anton Hansson
c7c6dc711b Merge "Make banchan support arm64only and x86_64only" am: 59699234bc am: bf6553e9dd am: ce377be68d am: 49fda11626
Original change: https://android-review.googlesource.com/c/platform/build/+/2207697

Change-Id: I6e9509f41564ac192bdb1103a5dfe5fdc935f0cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 13:35:46 +00:00
Inseob Kim
3c37a83f8d Merge "Check same vndk variants when builing vndk_package" am: 5c60e24509 am: f396dd153b am: 73044c9127 am: c2aafc7ca5
Original change: https://android-review.googlesource.com/c/platform/build/+/2208858

Change-Id: I59aaab69712e4942118cbe0b956266e7007bac8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 13:34:23 +00:00
Anton Hansson
59699234bc Merge "Make banchan support arm64only and x86_64only" 2022-09-08 10:57:34 +00:00
Inseob Kim
5c60e24509 Merge "Check same vndk variants when builing vndk_package" 2022-09-08 09:31:25 +00:00
Anton Hansson
533fb45b9a Merge "add module_x86_64only product" am: fe9d1d316d am: 3f5b7c3dbb am: e180270b7a am: 19855615d5
Original change: https://android-review.googlesource.com/c/platform/build/+/2207696

Change-Id: Ia71a2c03f9c39083eef956f9bd8471834d9cae07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 14:26:51 +00:00
Anton Hansson
5cc0b4ff73 Merge "add module_arm64only product" am: 25ce929205 am: 8483fca791 am: 5dbfdae92b am: 1b52ed8def
Original change: https://android-review.googlesource.com/c/platform/build/+/2207695

Change-Id: Ie71bec036a01f13efb0044287814eed150030d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-07 13:32:00 +00:00
Inseob Kim
ad503c265c Check same vndk variants when builing vndk_package
Since the vndk apex is introduced, same vndk variants check has stopped
when building vndk_package, and it's performed only with checkbuild.

Bug: 244654349
Test: m vndk_package
Change-Id: Iee30b5df75565c024f93d40bc6eaa7a729c2e09c
2022-09-07 20:02:30 +09:00