Commit Graph

32025 Commits

Author SHA1 Message Date
Jiakai Zhang
4a30e138e2 Fix the build system to pass "-Xgc:CMC" to dex2oat correctly.
Bug: 242553398
Test: -
  1. lunch aosp_oriole-userdebug
  2. m
  3. Don't see "--runtime-arg -Xgc:CMC" in .invocation files.
Test: -
  1. lunch aosp_oriole-userdebug
  2. OVERRIDE_ENABLE_UFFD_GC=true m
  3. See "--runtime-arg -Xgc:CMC" in .invocation files.
Change-Id: If1c2c5feecc8148a0e2fa6a0e0b23641945f5b1d
2022-11-23 11:28:20 +00:00
Treehugger Robot
092073607d Merge "Determine whether to enable userfaultfd GC at build time." 2022-11-22 15:10:20 +00:00
Jiakai Zhang
d6c6e3a9f3 Determine whether to enable userfaultfd GC at build time.
This is determined by:
- a product config flag
- the vendor API level

It is then passed to the device as a system property
"ro.dalvik.vm.enable_uffd_gc".

This change is a no-op change. It doesn't enable userfaultfd GC by
default. OVERRIDE_ENABLE_UFFD_GC=default can be passed to the build
system to enable userfaultfd GC for testing purposes.

Bug: 242553398
Test: -
  1. lunch aosp_redfin-userdebug
  2. OVERRIDE_ENABLE_UFFD_GC=default build/soong/soong_ui.bash --dumpvars-mode --vars=ENABLE_UFFD_GC
  3. See "false" in the output
Test: -
  1. lunch aosp_oriole-userdebug
  2. OVERRIDE_ENABLE_UFFD_GC=default build/soong/soong_ui.bash --dumpvars-mode --vars=ENABLE_UFFD_GC
  3. See "true" in the output
Test: -
  1. lunch aosp_redfin-userdebug
  2. OVERRIDE_ENABLE_UFFD_GC=true build/soong/soong_ui.bash --dumpvars-mode --vars=ENABLE_UFFD_GC
  3. See "true" in the output
Test: -
  1. lunch aosp_oriole-userdebug
  2. OVERRIDE_ENABLE_UFFD_GC=false build/soong/soong_ui.bash --dumpvars-mode --vars=ENABLE_UFFD_GC
  3. See "false" in the output
Change-Id: Ifd6e6cddb502315912ff949619a5b526ae0d73ff
2022-11-17 16:33:44 +00:00
Sorin Basca
0801b18080 Export com.sun.tools.javac.api for IsolatedHostTest
Bug: 233029164
Test: TH
Change-Id: I051c842d2bbf50764e7e6f4764e22f7a5c989336
2022-11-17 11:18:44 +00:00
Nikita Ioffe
05cc591fff Merge changes from topics "move-avf-jar-to-bcp", "virt-apex-on-system"
* changes:
  Add framework-virtualization to PRODUCT_APEX_BOOT_JARS
  Unconditionally install com.android.virt APEX
2022-11-16 08:49:36 +00:00
Nikita Ioffe
bb9d6db326 Unconditionally install com.android.virt APEX
The change in the packages/modules/Virtualization in the same topic
takes care for defining the right variant of the APEX to be installed:

* Devices with AVF support will get the full com.android.virt APEX
* Devices without AVF support will get an almost empty version that only
  contains an app that defines AVF-related permissions, and soon the BCP
  fragment jar.

Bug: 243512044
Test: build & flash oriole
Test: build & flash redfin
Change-Id: I2c38e03529a77dd2820212812433741725115ce0
2022-11-15 08:40:11 +00:00
Colin Cross
15b02bd17d Merge "Add basic musl support to make" 2022-11-15 01:39:37 +00:00
Steven Moreland
4db1ffa24a clearer VNDK deprecation warning
Bug: 122954981
Change-Id: If629256f1c1b13d3d11c50fe77bfbab1f316dd7a
Test: N/A
2022-11-12 01:39:55 +00:00
Colin Cross
af7ac3986e Add basic musl support to make
There are still devices that set BUILD_BROKEN_USES_BUILD_HOST_* and
build host modules in Make.  Add basic support for building against
libc_musl in Make when USE_HOST_MUSL is set.

Bug: 258535366
Test: build a host tool defined in Android.mk file in internal branch
Change-Id: I9150be749bbeaac2ac5a33b2cf915004aa3033df
2022-11-09 16:40:25 -08:00
Bill Yi
fafba401d3 Merge TP1A.221105.002 to aosp-master - DO NOT MERGE
Merged-In: I760ad49579961037628fde4d0300644aa2f6c188
Merged-In: I4e94edbf42259eedb96e46d85b46c2d336f59d75
Merged-In: I4e94edbf42259eedb96e46d85b46c2d336f59d75

Change-Id: I453b1617db1973432e2745718ec3e3c86cd933e6
2022-11-08 22:26:15 -08:00
Dennis Shen
888539c4c8 Add missing fsck.erofs and blkid to OTATOOLS
BUG: b/257882042
Change-Id: I9821106d45fa6c66f7482be2d0cdd605fe61706f
2022-11-07 18:56:47 +00:00
Islam Elbanna
4fbebb6d9d Merge "Zip apex system server and standalone system server jars into system_server.zip." 2022-11-07 11:40:52 +00:00
Kevin Dagostino
d1e43a8d7c Merge "export tradefed .xml templates for tests" 2022-11-04 19:40:20 +00:00
Islam Elbanna
ab52f4baaa Zip apex system server and standalone system server jars into system_server.zip.
Currently, the Art benchmark service is depending on the boot.zip file
to filter out boot image profiles based on the existing jars in this zip
file, and to expand profiling to apex system server jars and standalone
jars we need to export these jars in another zip file.

Bug: 241823638
Test: Checked the generated `system_server.zip` using `m droidcore dist`
Test: Checked with aosp and internal targets
Change-Id: I477dcfd3381bd24bdc50aabb773b38f8840f0ce0
2022-11-04 15:52:37 +00:00
Jiakai Zhang
4b9babc12c Merge "Revert "Zip apex system server and standalone system server jars into system_server.zip."" 2022-11-03 15:55:12 +00:00
Jiakai Zhang
64c4a419c2 Revert "Zip apex system server and standalone system server jars into system_server.zip."
This reverts commit 8503760df9.

Reason for revert: Broke build https://android-build.googleplex.com/builds/pending/P43406477/aosp_arm64-userdebug/latest/view/logs/build_error.log

Change-Id: Ifd51a17e4e608a885a0e0cd146e2c20fe7e5eabb
2022-11-03 15:16:10 +00:00
Islam Elbanna
29c6a75025 Merge "Zip apex system server and standalone system server jars into system_server.zip." 2022-11-03 14:10:47 +00:00
Treehugger Robot
cecd960ee9 Merge "Do not force rebuilds after changing host kernel." 2022-11-03 06:19:52 +00:00
Kevin Dagostino
ceacee8525 export tradefed .xml templates for tests
Test: xml files are usable by the tradefed rule.
Change-Id: Ifef40fb6cf6a4e5e4be6541dc031628409a710ee
2022-11-03 05:31:28 +00:00
Peter Collingbourne
0d06f702dd Do not force rebuilds after changing host kernel.
Change-Id: I0c62eda893531853e6d192f6551a919d10e12acd
2022-11-02 15:44:14 -07:00
Islam Elbanna
8503760df9 Zip apex system server and standalone system server jars into system_server.zip.
Currently, the Art benchmark service is depending on the boot.zip file
to filter out boot image profiles based on the existing jars in this zip
file, and to expand profiling to apex system server jars and standalone
jars we need to export these jars in another zip file.

Bug: 241823638
Test: Check the generated `system_server.zip` using `m droidcore dist`
Change-Id: Ief2c92588b5e4f6ccd5163ece8d241bc473b22ad
2022-11-02 12:34:22 +00:00
Treehugger Robot
99d607c0ad Merge "Unconditionally generate build_manifest.pb" 2022-11-01 23:50:05 +00:00
Victor Hsieh
921d3b0f11 Unconditionally generate build_manifest.pb
Previously, the file is generated only if there's interesting files. The
condition isn't really desirable in build rule evaluation, and makes it
a bit harder to handle in the consuming code.

Bug: 256793394
Test: atest ComposHostTestCases odsign_e2e_tests
Change-Id: I87b257b6ce6ab0ba565378c885adf35c1d25235b
2022-11-01 11:08:31 -07:00
Hongguang
07babe080a Check packages/modules before packing otatools keys
Fix build error when packages/modules is not existed.

Bug: 256565230
Test: make dist, check otatools.zip
Change-Id: I4153b143e677e35f95a3d47663cb8efcde7abdbf
2022-11-01 00:33:25 +00:00
Hongguang
547812d318 Pack the mainline modules test keys into the otatools.zip
Bug: 256565230
Test: make dist, check otatools.zip
Change-Id: I7c386ee8f8e3ec6f3d5c767504e23cb1f1bacad2
2022-10-31 10:25:29 -07:00
Anton Hansson
0cd509a08a Merge "Revert^2 "Update naming of platforms subdir"" 2022-10-31 12:57:30 +00:00
Treehugger Robot
a56bce6ef1 Merge "Speed up m command autocompletion" 2022-10-28 20:40:32 +00:00
Cole Faust
5d825b7a68 Speed up m command autocompletion
Generate a all_modules.txt file on every build that
can be used for autocompleting.

Because this adds time to every non-incremental build,
I profiled it by using `$(shell date +"%s.%3N")` before
and after, and disovered it only adds about 0.01 seconds
to the build. And of course it won't be rerun if there
weren't build changes.

Bug: 255867758
Test: Manually
Change-Id: I1d3f1008611fd542884322b27b19ea2fa1d341fe
2022-10-28 10:44:02 -07:00
Anton Hansson
874dbe7b1b Revert^2 "Update naming of platforms subdir"
This reverts commit 6137ffa5de.

Reason for revert: Roll-forward with fix for codename SDKs (PS2)

Test: m sdk dist in all 3 variants of branches
Change-Id: Iffdf650a43aa050d70e01f73d78cf622cb206fc6
2022-10-28 09:03:33 +00:00
Victor Liu
c8c98e3f00 Merge "Revert "Fix typo"" 2022-10-27 19:11:31 +00:00
Brad Hinegardner
3e7f6b737c Revert "Fix typo"
Revert "Revert ^2 "Prevent unspecified values in soong_config_st..."

Revert submission 2262062-colefaust_soong_config_string_variable_2nd_try

Reason for revert: breaks builds, b/255996492 among others
Reverted Changes:
I3e2f59e5f:Fix typo
Id3bcd9a46:Revert ^2 "Prevent unspecified values in soong_con...

Change-Id: I9a9a150844c19eb8421575f5753b335f80ab6c66
2022-10-27 19:01:15 +00:00
Treehugger Robot
30b4bde37a Merge "core: Use pvmfw_embedded_key for INTERNAL_PVMFW_EMBEDDED_AVBKEY" 2022-10-27 18:47:43 +00:00
Spandan Das
03b846ff37 Merge "Migrate check_elf_file.py to python3" 2022-10-27 16:46:18 +00:00
Cole Faust
eef714a380 Merge "Fix typo" 2022-10-27 16:41:29 +00:00
Yi-yo Chiang
ed5649636a Merge "Reland "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var"" 2022-10-27 08:26:54 +00:00
Spandan Das
60b8195c83 Migrate check_elf_file.py to python3
Also, create a python_binary_host so that it runs using the hermetic
python toolchain.

Test: m check-elf-files
Bug: 203436762
Change-Id: I964342a27f6b6c9dcdbbe910d4dc6c9ec00c2213
2022-10-27 02:08:23 +00:00
Cole Faust
841ef28d32 Fix typo
build_test is only run on presubmit in internal master
for cls that change build/make and a few other repos,
but notably not build/soong. Add this cl to a topic
with a build/soong change we'd like to test with build_test.

Bug: 220375749
Test: Presubmits
Change-Id: I3e2f59e5f341cce486368dac9bf2f28f265e53fd
2022-10-26 11:24:06 -07:00
Treehugger Robot
b41bb81505 Merge "Revert "Update naming of platforms subdir"" 2022-10-26 17:17:28 +00:00
Pierre-Clément Tosi
615f081bcf core: Use pvmfw_embedded_key for INTERNAL_PVMFW_EMBEDDED_AVBKEY
Instead of wrongly using the key that was used to sign pvmfw, we should
have been using the key that pvmfw will use to verify payloads it
receives so fix that.

Bug: 255575669
Test: -
Change-Id: I68a87a092c1aa4a60f4fbe60c5ddf82c4e34c38a
2022-10-26 16:05:16 +01:00
Alan Viverette
6137ffa5de Revert "Update naming of platforms subdir"
This reverts commit 8b22209184.

Reason for revert: Doesn't match install path for pre-release SDKs

Change-Id: Ic1ce28e57692d27d08d33dee5b7403bf1bf1b655
2022-10-26 14:35:54 +00:00
Yi-yo Chiang
05c0807f2f Reland "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var"
This reverts commit d6e2c8f84d.

Reason for revert: downstream branches are fixed

Change-Id: I55fa6e8db37d0b7d040679f54be238b512437d29
2022-10-25 17:46:10 +00:00
Cole Faust
6a75c4f782 Delete java-layers.py
There are no usages of LOCAL_JAVA_LAYERS_FILE,
and java-layers.py was written in python 2.

Bug: 203436762
Test: Presubmits
Change-Id: I1be0f2547757a853e20811f28529479487037e94
2022-10-24 18:15:54 -07:00
Treehugger Robot
3946ea0318 Merge "Revert "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var"" 2022-10-24 15:32:05 +00:00
Yan Han
d6e2c8f84d Revert "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var"
This reverts commit 2bd45d0fd8.

Reason for revert: b/255298902

Change-Id: If0b006b0d88dd08ff116abc50d7b9dd4c8ea5806
2022-10-24 12:58:31 +00:00
Yi-yo Chiang
b72a874d4d Merge "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var" 2022-10-24 09:25:25 +00:00
Colin Cross
516cf13c05 Merge "Add a phony target to dist ndk_sysroot.tar.bz2" 2022-10-21 00:35:28 +00:00
Colin Cross
ec65b76217 Add a phony target to dist ndk_sysroot.tar.bz2
Test: lunch aosp_riscv64-userdebug && m ndk_sysroot
Change-Id: I9e1a7da8cd837fa50503f6458ed6b91829611a61
2022-10-20 14:03:47 -07:00
Anton Hansson
2e55cb4f6b Merge "Update naming of platforms subdir" 2022-10-19 11:52:32 +00:00
Devin Moore
ee4bc816c3 Merge "Restrict the framework manifest check against frozen files" 2022-10-18 15:22:32 +00:00
Anton Hansson
8b22209184 Update naming of platforms subdir
The build system previously named the platforms subdir by
PLATFORM_VERSION, which is 13 for android 13, aka T, so the subdir
name would be android-13.

Android studio installs the SDK into a subdir identified by the api
level, so android-33 for android T, and also the extension api level
for extension SDKs, e.g. android-33-ext4.

Update the build system subdir name to match the android studio install
path, in order to avoid confusion and make it simpler to just unzip
a built SDK into the platforms dir, avoiding the need to provide a
package.xml file for studio to install it correctly.

Bug: 254023524
Test: m sdk sdk_repo dist, verify subdir is android-33 in:
   $ zipinfo -1 out/dist/android-sdk_eng.hansson_linux-x86.zip \
     | cut -f 1-3 -d '/' | grep platforms | sort | uniq
Change-Id: I1d3a7fd4c480859c28cdcbcb8c0cf2800ac4a1d7
2022-10-18 13:43:46 +00:00