Commit Graph

35795 Commits

Author SHA1 Message Date
Colin Cross
da0bc02bbf Merge "Use files written by Soong" into main 2023-11-30 00:41:43 +00:00
Daniel Rosenberg
5514a5aaf6 Merge "Add support for different F2FS block sizes" into main 2023-11-30 00:24:46 +00:00
Colin Cross
3a2ff8e27e Use files written by Soong
Soong now writes transitive resource packages and combined proguard
flags files to files instead of passing them as a list to Make, so
Make no longer needs to write them to files.

Bug: 309006256
Test: m checkbuild
Change-Id: I3ff78047f417f8578063f9c7a97ef4c65ba33af3
2023-11-29 10:18:52 -08:00
Jiakai Zhang
1f61e734d6 Merge changes from topics "disable-art-service-dexopt", "remove-preopt-extracted-apk" into main
* changes:
  Remove PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK.
  Set `dalvik.vm.disable-art-service-dexopt=true` on eng build.
2023-11-29 10:17:29 +00:00
Yi-Yo Chiang
3afaac28b9 Merge "Deprecate BOARD_GKI_SIGNING_* vars and build rules" into main 2023-11-29 03:04:59 +00:00
Colin Cross
00a0933af0 Merge "Don't store notice files for Soong modules" into main 2023-11-28 22:51:32 +00:00
Jiakai Zhang
364e9c39de Remove PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK.
This was added by r.android.com/513843 to force dexpreopt some GMS core
modules even if dexpreopt is disabled, to avoid some memory usage
regression. We no longer need it because dexpreopt is never disabled on
production builds.

Bug: 313505540
Test: m
Change-Id: Iff7f1d340a3ecd64cdc3d2f83f9c37c109a81fda
2023-11-28 13:46:13 +00:00
Timothy Yiu
970bf093cd Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main 2023-11-28 05:41:32 +00:00
Daniel Rosenberg
d9a520c5bd Add support for different F2FS block sizes
F2FS has been expanded to allow for different block sizes. Currently the
block size must be the same as page size, but this may change in the
future. This gives support for 16K while not restricting the ability to
choose a block size that isn't based on the page size later on.

Bug: 279820706
Test: Boot 16k F2FS device
Change-Id: I4e025d83a5e5ad03d89bc80b02fea390c2cbad69
2023-11-27 18:09:18 -08:00
Yi-Yo Chiang
d6f568f587 Deprecate BOARD_GKI_SIGNING_* vars and build rules
These were for building and signing GKIs in the platform tree.
We are no longer building GKIs this way, so remove these dead build
rules.

Bug: 229701033
Test: presubmit
Change-Id: I0b807de1407988489e994ec5a0da282616ac1af1
2023-11-28 09:31:47 +08:00
Yi-Yo Chiang
5366754f62 Merge "Deprecate BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" into main 2023-11-28 00:38:44 +00:00
LaMont Jones
a6b6e67e3b Allow overrides in declare-release-config
A release config declaration may indiciate that one or more other
release configs should be applied before this one overrides them, so
that we don't have to manually keep common flags in sync.

Bug: b/313479515
Test: manual
Merged-In: Ib7350500ae44adf4767aa7f9dbb8e71609fdd8c0
Merged-In: Ida444a5dbba578a36bd3607246fa14fc73b3f923
Change-Id: Ida444a5dbba578a36bd3607246fa14fc73b3f923
2023-11-27 22:02:56 +00:00
tyiu
bbaa5efbbc Add config for FULL_SYSTEM_OPTIMIZE_JAVA
FULL_SYSTEM_OPTIMIZE_JAVA allows device to enable full system java
optimization.

Bug: 300514883
Test: local m
Change-Id: Iba0a546ef2b721b929b791c6a9e6c854e9bec909
Merged-In: Iba0a546ef2b721b929b791c6a9e6c854e9bec909
2023-11-27 19:29:31 +00:00
Yi-Yo Chiang
f061800468 Deprecate BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK
These variables are no longer used. We don't build GKI in the platform
tree anymore. Remove these vars as we are not maintaining these.

Bug: 229701033
Test: presubmit
Change-Id: If8c978a07094da6a651c1e3f06a437dea9ef52b9
2023-11-24 15:04:33 +08:00
Justin Yun
f2b6016e53 Define ro.llndk.api_level
If RELEASE_BOARD_API_LEVEL is defined, set the API level to
ro.llndk.api_level to show the maximum api level that the LLNDK in
the system partition supports.

Bug: 312098788
Test: getprop ro.llndk.api_level
Change-Id: Ia65bf6c30ea19b229543d35df788eb202fd50dd4
2023-11-22 20:08:49 +09:00
Colin Cross
acd61f926f Don't store notice files for Soong modules
Soong modules have already generated their license metadata file, the
stored notice file list is not used.

Bug: 309006256
Test: no change to out/build-cf_x86_64_phone.ninja
Change-Id: I69ab4e3023db7ed42363e4a8eedbd737f237e509
2023-11-21 15:42:15 -08:00
Inseob Kim
aa9a4a4907 Add CHECK_DEV_TYPE_VIOLATIONS
If PRODUCT_CHECK_DEV_TYPE_VIOLATIONS is set or vendor api level is
greater than V (35), sepolicy dev type test will be run which checks if
all /dev nodes have dev_type attribute.

Bug: 303367345
Test: set PRODUCT_CHECK_DEV_TYPE_VIOLATIONS, see
sepolicy_dev_type_test's build command

Change-Id: Ibf25c1dacb5132ccda5265d6d2ce9fe655ffbc87
2023-11-21 13:01:40 +00:00
Devin Moore
ca2c656091 Merge "Respect PRODUCT_PACKAGES_SHIPPING_API_LEVEL in artifact path checker" into main 2023-11-20 21:49:35 +00:00
Devin Moore
d47e194115 Respect PRODUCT_PACKAGES_SHIPPING_API_LEVEL in artifact path checker
Test: lunch gsi_tv_arm-userdebug  && m
Bug: 299166571
Change-Id: Ic2ceab29967ef5343dc924c52e0928ada06671f8
2023-11-20 20:45:58 +00:00
Jiakai Zhang
5b5ab173ed Disable boot.zip on eng build.
boot.zip is not useful on eng build.

Bug: 310681823
Test: lunch aosp_cf_x86_64_phone-trunk_staging-eng && m dist
Change-Id: I40eb73d1783381bd38b644709769d5ff51397b3e
2023-11-17 22:23:28 +00:00
Colin Cross
6b35685744 Merge "Store ALL_DEPS under my_register_name" into main 2023-11-17 21:09:55 +00:00
Colin Cross
276d8bdd50 Merge "Remove ALL_DEPS.MODULES" into main 2023-11-17 21:08:28 +00:00
Jihoon Kang
03aa6e725e Merge "Revert^2 "Disable from-text stub build for sdk products"" into main 2023-11-17 09:39:06 +00:00
Inseob Kim
8fc7cf6301 Merge "Add support for auto-generated characteristics RRO" into main 2023-11-17 05:02:28 +00:00
Jihoon Kang
9e0998b777 Revert^2 "Disable from-text stub build for sdk products"
This change introduces `PRODUCT_BUILD_FROM_SOURCE_STUB` product
variable, which is set to true for sdk targets.

This change resubmits https://r.android.com/2834692.

Test: m TARGET_PRODUCT=sdk TARGET_RELEASE=trunk_staging sdk and inspect ninja query to verify that stubs are built from source
Bug: 311203379
Change-Id: I7d9f833ae76ceabbf2ce4df0141688e24ea164c8
2023-11-17 01:52:12 +00:00
Jihoon Kang
3666e601ec Merge "Revert "Disable from-text stub build for sdk products"" into main 2023-11-17 01:04:34 +00:00
Jihoon Kang
608493e0ff Revert "Disable from-text stub build for sdk products"
Revert submission 2832580-sdk-from-source-stub

Reason for revert: Breaking sdk builds
Reverted changes: /q/submissionid:2832580-sdk-from-source-stub

Change-Id: Id2e1bf4b5d513d12bb794405a74dfdbed870c4e1
2023-11-17 00:58:42 +00:00
Treehugger Robot
b0d8fafba8 Merge "Disable from-text stub build for sdk products" into main 2023-11-17 00:29:05 +00:00
Jihoon Kang
3621c914a6 Disable from-text stub build for sdk products
This change introduces `PRODUCT_BUILD_FROM_SOURCE_STUB` product
variable, which is set to true for sdk targets.

Test: m TARGET_PRODUCT=sdk TARGET_RELEASE=trunk_staging sdk and inspect ninja query to verify that stubs are built from source
Bug: 311203379
Change-Id: I99ad04fb6b61eebfeee68f23f8865ab55d69cdbd
2023-11-16 23:09:29 +00:00
Colin Cross
9cb51b7446 Store ALL_DEPS under my_register_name
ALL_DEPS was original stored in ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS for
use by the old licensing code.  That has been removed, and it is now
only used by module-info.json.  Storing it with $(LOCAL_MODULE) causes
_32 entries in module-info.json to be missing dependencies, and causes
the dependencies from _32 variants to be squashed into the normal
variants.  Replace ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS with
ALL_MODULES.$(my_register_name).ALL_DEPS.

Test: builds
Change-Id: Ieddfcddd8547b61bd938ae051beb738268aac5af
2023-11-16 11:46:40 -08:00
Anas Sulaiman
3e17366053 Merge "fix RE for metalava actions" into main 2023-11-16 18:42:24 +00:00
Kiyoung Kim
25b71e0689 Merge "Deprecate VNDK based on feature flag" into main 2023-11-16 00:37:29 +00:00
Anas Sulaiman
5dacf0f6dd fix RE for metalava actions
Some of those actions use unzip which is not available in the source
tree and needs to be installed in the container.

Bug: b/309783005
Test: Ran an android build and verified there are no local fallbacks from metalava actions.
Change-Id: I360c3fb30e2eacc0615ed636115bce011bff5bf3
2023-11-15 20:39:45 +00:00
Greg Kaiser
2c8ece0b25 Merge "Reland: Require TARGET_RELEASE for builds" into main 2023-11-15 13:42:18 +00:00
Justin Yun
59fbdf0bba Add .product suffix for the product variants
Instead of adding .vendor suffix, add .product suffix to include
product variants.

Bug: 309511650
Test: atest com.android.gts.vndk.VndkDependencyTest#testVndkDependencyTestCase
Change-Id: I6d578be95c618c565347f0fdf660e82945ac77a3
2023-11-15 14:59:39 +09:00
Alyssa Ketpreechasawat
c7bc53999d Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main 2023-11-14 19:13:32 +00:00
Colin Cross
93e1e702a4 Remove ALL_DEPS.MODULES
Nothing reads it any more.

Test: m checkbuild
Change-Id: I6f11a5273b0c2cc92a3b0c49bbefbf084cb734a1
2023-11-14 11:03:08 -08:00
Justin Yun
136fa83d4e Merge "Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN" into main 2023-11-13 23:40:06 +00:00
Alyssa Ketpreechasawat
ba231d2084 Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled.
framework-pdf is newly added framework jar which is not yet included in
the actual prebuilt apex. Thus, we add it PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY. The APEX_BOOT_JARS_EXCLUDED will be created based on PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY and will be removed from ApexBootJars.

Bug: 304719212
Test: lunch cf_x86_phone-next-userdebug & m
Test: lunch cf_x86_phone-trunk-userdebug & m
Change-Id: I9902131629900fbd629b8560a422ed8c2b06073c
2023-11-13 13:22:32 +00:00
Colin Cross
70ed34cc72 Merge "Escape sbom lines" into main 2023-11-11 03:22:11 +00:00
Colin Cross
92f8043874 Escape sbom lines
Go 1.21 changes the names of some factory functions to include
characters that need shell escaping.  Wrap everything written to
the sbom file with single quotes.

Bug: 309895579
Test: m out/target/product/vsoc_x86_64/sbom-metadata.csv
Change-Id: Ia61f02d8b02dd9f92ce144307087423c592a1833
2023-11-10 15:06:21 -08:00
Treehugger Robot
fc9ebd2684 Merge changes from topic "disable-dexpreopt-dexopt" into main
* changes:
  Add a Make variable to disable all dexpreopt and dexopt activities.
  Update dexopt system properties.
2023-11-10 18:47:19 +00:00
Justin Yun
23d52435f3 Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN
BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN are set by the release
flags.
BOARD_API_LEVEL sets ro.board.api_level that shows the API level of
the vendor API surface.
BOARD_API_LEVEL_FROZEN sets ro.board.api_frozen that shows if the
ro.board.api_level is finalized.

Bug: 295269182
Test: getprop ro.board.api_level
Change-Id: Ie57c57b6c9f1fc0c98968195843059a48da8e512
2023-11-10 16:31:04 +09:00
Colin Cross
481b02106c Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main 2023-11-10 06:15:45 +00:00
Juan Yescas
06b7b6c492 Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main 2023-11-09 23:07:09 +00:00
Juan Yescas
ebadc969a8 16k: Support max-page-size alignment greater than 4096 for x86-64
To simulate 16k page size in x86-64 cuttefish, it is necessary
to compile the shared libraries and binaries with max-page-size greater
than 4096.

Bug: 309816695
Test: source build/envsetup.sh
      lunch aosp_cf_x86_64_phone_pgagnostic-trunk-userdebug
      m
Change-Id: Id8e142a5a3556f5fd30ce90eaac236dcbc1b0881
2023-11-09 12:51:30 -08:00
Cole Faust
b9b54396d4 Remove _kwmarker
python and starlark already have syntax for this.

Test: Presubmits
Change-Id: I9082c1cc62837840f091cd5856b1b4cc39064274
2023-11-09 12:40:38 -08:00
Greg Kaiser
0229ecfae5 Reland: Require TARGET_RELEASE for builds
Relanding because we've fixed a number of the broken build
setups this change exposed.  We will push to fix forward broken
build setups instead of reverting this change again.


Rather than use an unsupported flag setting that the user likely
doesn't even realize is being used, we immediately stop the build.

This error message is more verbose, mentioning 'lunch', because
it's anticipated a lot more users will hit this issue when first
switching to trunk stable, and more details will hopefully help
them out.

We have some complication in that some internal commands set
TARGET_RELEASE to an empty string.  We put in logic to allow
that path.

Since $(error) immediately stops the build, we also get rid of
some 'else' logic and indentation, to hopefully offset some of
the complication we've added.

Bug: 307946156
Change-Id: I0fa4a1c876e607401f4c7f945b9971cfb8db71a0
Test: 'lunch' (still) works; A build attempt without `TARGET_RELEASE` set (now) fails
2023-11-09 20:28:55 +00:00
Jiakai Zhang
bf0c0e6856 Add a Make variable to disable all dexpreopt and dexopt activities.
This change adds a Make variable "OVERRIDE_DISABLE_DEXOPT_ALL", which
disables all dexpreopt and dexopt activities.

This is for faster iteration during development and should never be
enabled for production.

Bug: 309011617
Test: See no dex2oat invocation during build.
Test: Boot and see no dex2oat invocation during boot, except for the
  in-memory boot image for JIT Zygote.
Change-Id: I0193b57fdb18e1fb717f44af81d1cf525f1609ee
2023-11-09 16:50:18 +00:00
Robin Lee
092c6b68b8 Merge "Revert "Require TARGET_RELEASE for builds"" into main 2023-11-09 08:49:25 +00:00