Commit graph

1664 commits

Author SHA1 Message Date
Edward Liaw
a06534686f Merge "linux-kselftest: Remove special cased build rule for kselftest" into main am: 41d4b0b3af
Original change: https://android-review.googlesource.com/c/platform/build/+/2736953

Change-Id: Ia5a3c3ed37738c58404dc7a9ea78d74bd509ead2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 01:48:39 +00:00
Edward Liaw
ba282927bf linux-kselftest: Remove special cased build rule for kselftest
Bug: 277261121
Bug: 293945424
Test: m vts
Change-Id: I1c5992730958645e96037fa01a5c110cf410753b
Signed-off-by: Edward Liaw <edliaw@google.com>
2023-09-15 22:49:17 +00:00
Colin Cross
cbc3ace1db Merge "Update LOCAL_JAVA_LANGUAGE_VERSION logic to match Soong" into main am: 708dc5bf81
Original change: https://android-review.googlesource.com/c/platform/build/+/2748842

Change-Id: I1d7c1ae71a916ab497a0ee8ba81b89718922fa37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 18:01:14 +00:00
Colin Cross
82df516665 Update LOCAL_JAVA_LANGUAGE_VERSION logic to match Soong
Support LOCAL_JAVA_LANGUAGE_VERSION := 11 or 17 and match the default value of 17 used
in Soong.

Bug: 298613711
Bug: 299937334
Test: m javac-check
Change-Id: I19aa24cc5197ab0e6cb03361124c36ce3e316810
2023-09-13 04:53:17 +00:00
Inseob Kim
387befd639 Merge "Remove code about mixed sepolicy build" into main am: 3c7a42328c
Original change: https://android-review.googlesource.com/c/platform/build/+/2734338

Change-Id: Ib7f7344c4b493afe0e70603f069a20b04cd4c90e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 01:33:44 +00:00
Inseob Kim
c36ff859e9 Remove code about mixed sepolicy build
There is no one actively using mixed sepolicy build, and it made
sepolicy codes too complicated. As we are deprecating mixed build,
removing such code for cleanup.

Bug: 298305798
Test: boot cuttlefish
Change-Id: I6efcfd7bde398564f909b41b3e156ac3d98d64d6
2023-08-31 16:52:04 +09:00
Treehugger Robot
d6e3f50ed0 Merge "Use board api level for seapp coredomain check" into main am: c8c6cbbb27
Original change: https://android-review.googlesource.com/c/platform/build/+/2727597

Change-Id: Ib240dec2e031f1e5f6ba650c7a9dada63282fad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 01:56:09 +00:00
Inseob Kim
3c7b91bac1 Use board api level for seapp coredomain check
Rather than PRODUCT_SHIPPING_API_LEVEL, use board api level
(BOARD_API_LEVEL or BOARD_SHIPPING_API_LEVEL) to determine whether we
check coredomain violations or not.

Also provides a Makefile variable to override the flag, for targets that
want to turn on the check optionally.

Bug: 280547417
Test: see build command of vendor_seapp_contexts
Change-Id: I177630d33313334ca4a56a9be88b78cff678281e
2023-08-28 07:33:12 +00:00
Xin Li
be1435290d Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: If9360ebd0acebe85f42f89a268c316d51c765708
Change-Id: I58470464a3239a2ad8e82e4821bb27a2892a8302
2023-08-25 13:25:26 -07:00
Treehugger Robot
b531ccf36e Merge "Skip building compat files if REL" into main 2023-08-25 04:29:28 +00:00
Inseob Kim
9b2631d11a Skip building compat files if REL
In release build, we don't need to (and shouldn't) build compat files,
because it doesn't make sense to build compat files for itself.
Currently this didn't happen because REL build only happens on -dev
branches. To support main branch setting REL, filtering out
PLATFORM_SEPOLICY_VERSION from compat versions list.

Bug: 296780580
Test: build with next
Change-Id: Ia5c09a1c9b4209ed82dc66307d57decb4f442477
2023-08-25 04:29:09 +00:00
Kelvin Zhang
6257eb2144 Add a 16K boot partition OTA target
This OTA will be used to switch real devices to 16K kernel

Test: th
Bug: 293313353
Change-Id: I7a5866fd6f7f4ba6646af019386085ea2646c93f
2023-08-24 13:44:59 -07:00
Juan Yescas
24b02ed724 core: ARM 32-bit targets must be built with 4k elf alignment
- ARM 32-bit targets will be built with 4096 ELF alignment.
- ARM 32-bit targets will only support 4K Page sizes.
- ARM 32-bit targets won't be page agnostic.

Test: source build/envsetup.sh
      lunch aosp_cf_x86_64_phone
      m
Bug: 295550555
Change-Id: I1fda20ee06759cfe30e2e244616456d1ffa5ad66
2023-08-11 11:50:28 -07:00
Juan Yescas
6196841f4d 16k: core: Check that TARGET_MAX_PAGE_SIZE_SUPPORTED is greater than 4096 only for ARM archs.
For arm archs, PRODUCT_MAX_PAGE_SIZE_SUPPORTED  values can be 4096, 16384, 65536.
For other archs, PRODUCT_MAX_PAGE_SIZE_SUPPORTED can only be 4096.

Note: The linker flag max-page-size is configured by PRODUCT_MAX_PAGE_SIZE_SUPPORTED flag.

Bug: 289419664

Test: source build/envsetup.sh
      lunch aosp_cf_x86_64_phone
      build/make/core/config.mk:448: error: TARGET_MAX_PAGE_SIZE_SUPPORTED=65536 is greater than 4096. Only supported in ARM arch.

      source build/envsetup.sh
      lunch aosp_raven_64-userdebug

Change-Id: I887d6f12835f1bea4c6b92d7d836440b8d3fd6a8
2023-07-27 00:13:50 +00:00
Juan Yescas
1083f36818 16k: core: Add flag to make AOSP page size agnostic
The new boolean flag will be PRODUCT_PAGE_SIZE_AGNOSTIC.

When PRODUCT_PAGE_SIZE_AGNOSTIC is true:

- AOSP will use getpagesize() to retrieve the page size.
- The flag `TARGET_MAX_PAGE_SIZE_SUPPORTED` has to be equals to `65536`.
- AOSP will be able to use 4k/16k page size Linux kernels

When PRODUCT_PAGE_SIZE_AGNOSTIC is false:

- AOSP will only support 4k page size kernels.

Test: source build/envsetup.sh
      lunch aosp_raven_64-userdebug
      get_build_var TARGET_PAGE_SIZE_AGNOSTIC
      get_build_var PRODUCT_MAX_PAGE_SIZE_SUPPORTED
      65536

      source build/envsetup.sh
      lunch aosp_raven_64-userdebug
      build/make/core/config.mk:414: error: TARGET_MAX_PAGE_SIZE_SUPPORTED has to be 65536 to support page size agnostic.
      10:32:55 dumpvars failed with: exit status 1

Bug: 289419664
Change-Id: If8fc243a3e2cad77414a53a29805c7b6d349d4dd
2023-07-24 13:48:52 -07:00
Liz Kammer
36c619075e Merge "Allow setting some build_broken out of boardconfig" into main 2023-07-24 14:24:25 +00:00
Liz Kammer
b607281fae Allow setting some build_broken out of boardconfig
Some build broken flags are for cross-cutting features rather than
board-specific. In order to support these without requiring broad
changes across many board configs, these can be set in a buildspec.mk
files.

Test: set build_broken flags in environment, get expected fail
Test: set build_broken flags in buildspec, get expected success
Change-Id: I8a74c30575f6bf40e46281ca5f37f3cfed526ec5
2023-07-21 15:51:58 -04:00
Treehugger Robot
21e6105b79 Merge "Combine aconfig cache files into per-partition dumps." into main 2023-07-21 14:34:44 +00:00
Treehugger Robot
3ca44b286e Merge "Add a new variable for deprecating VNDK" into main 2023-07-19 04:44:51 +00:00
Kiyoung Kim
f019601670 Add a new variable for deprecating VNDK
Add a new flag variable for deprecating VNDK. This variable should be
passed to Soong, so it can change behavior based on the flag.

Bug: 290157355
Test: build succeeded with KEEP_VNDK=false
Change-Id: I3a9d1041411ad24ff42f76506a8f929e364b868d
2023-07-14 01:18:19 +00:00
Treehugger Robot
12e453bb55 Merge "Remove metalava --no-banner argument" into main 2023-07-12 17:08:42 +00:00
Mårten Kongstad
beb2bfded0 Remove metalava --no-banner argument
metalava no longer prints an ASCII banner, and has removed its
--no-banner argument. Update all call sites accordingly.

Test: presubmit
Bug: 286023667
Change-Id: I0159cad6571c62d672da5aeb3ff422abb97c7ac9
2023-07-12 14:07:22 +02:00
Elliott Hughes
c1577ff58b Merge "Switch from minigzip to gzip." into main 2023-07-11 15:52:27 +00:00
Joe Onorato
63a84551ca Combine aconfig cache files into per-partition dumps.
Bug: 283910439
Test: manual validation of outputs, soong unit tests
Change-Id: I5f7dc16ee42c3722dc66ffe964ed20479eea1e15
2023-07-07 17:33:09 -07:00
Elliott Hughes
97ad120adb Switch from minigzip to gzip.
Bug: http://b/288169261
Test: treehugger
Change-Id: I404cbcb850734ed8291c2215a4329fb372806d63
2023-06-27 15:39:05 -07:00
Inseob Kim
77e317d852 Add 34.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Bug: 288517951
Test: m selinux_policy
Change-Id: I4d5b0bffbc7dd4ec3852da1674937e349e2ab322
2023-06-23 15:51:26 +09:00
Treehugger Robot
e80e8b4c5c Merge "BOARD_VNDK_VERSION must be set first pass" am: a85c8a863a am: 7613afc5ae am: 1b805513cc
Original change: https://android-review.googlesource.com/c/platform/build/+/2613792

Change-Id: I4dad5a6ab484b68f53f1636634a7d98ea6073963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 00:47:10 +00:00
Steven Moreland
78549acb47 BOARD_VNDK_VERSION must be set first pass
Removing all places that consider that this might not be
set.

Bug: 122954981
Test: build
Change-Id: I62107d041410f4ee1d3652e394ed5e7688c12f25
2023-06-07 20:57:38 +00:00
Steven Moreland
990f2cc61b Merge "Remove PRODUCT_SEPOLICY_SPLIT." am: 0b219d399c am: e079e45b76 am: 8c9655adfb
Original change: https://android-review.googlesource.com/c/platform/build/+/2609965

Change-Id: I979b42a934e89b9704fca3e2105bff523bcfc8c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 00:28:19 +00:00
Steven Moreland
0b219d399c Merge "Remove PRODUCT_SEPOLICY_SPLIT." 2023-06-05 23:08:24 +00:00
Jiakai Zhang
615aa26fb2 Merge "Add an allowlist for modules that have broken optional_uses_libs." am: ccf0471af3 am: 69a4d0434d am: 2971f1995a
Original change: https://android-review.googlesource.com/c/platform/build/+/2611534

Change-Id: I494afe6e9fba7d517a453a53428c9dd49972cc04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 16:24:33 +00:00
Jiakai Zhang
9fd786cd55 Add an allowlist for modules that have broken optional_uses_libs.
Bug: 282877248
Test: m nothing
Change-Id: I6f0e76a6f147de1e6043b5abc4630342d46bafcc
2023-06-02 23:41:59 +01:00
Rob Seymour
a4145a3ad2 Merge "Do not set DISABLE_PREOPT_BOOT_IMAGES when doing a VSDK build." am: 7edc734ec1 am: 7844748642 am: 17f2908951
Original change: https://android-review.googlesource.com/c/platform/build/+/2602665

Change-Id: I8a8f6b22fcc18257f0d7b7adc3942f18c2b6ced7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 22:00:43 +00:00
Rob Seymour
7edc734ec1 Merge "Do not set DISABLE_PREOPT_BOOT_IMAGES when doing a VSDK build." 2023-06-02 19:27:09 +00:00
Jiakai Zhang
b2d027462d Merge "Drop INTERNAL_PLATFORM_MISSING_USES_LIBRARIES." am: 66a9cd195c am: a1683971b8 am: c3e3ca091d
Original change: https://android-review.googlesource.com/c/platform/build/+/2611171

Change-Id: I1b3a8ff230742314fff5defd0532f67b850f7faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 17:41:00 +00:00
Rob Seymour
0aaa561255 Do not set DISABLE_PREOPT_BOOT_IMAGES when doing a VSDK build.
Bug: 283843071
Test: build vsdk based image
Change-Id: Id35196d266994fe222f55a0711b52938253d48a7
2023-06-01 16:48:46 +00:00
Jiakai Zhang
f09e76c173 Drop INTERNAL_PLATFORM_MISSING_USES_LIBRARIES.
INTERNAL_PLATFORM_MISSING_USES_LIBRARIES was a workaround for CLC
construction. It's no longer needed because we have deferred the CLC
construction to Ninja phase.

Bug: 282877248
Test: Presubmit build tests.
Change-Id: Ib5d59caf58394f3bb93b4338146cbbbd58bb4f34
2023-06-01 16:44:35 +01:00
Steven Moreland
41792255af Remove PRODUCT_SEPOLICY_SPLIT.
Obsolete.

Bug: 257176017
Test: build&boot
Change-Id: I7ac95f8e55254b7c07ee5e5ba6c18c23a432bfa1
2023-05-31 22:01:16 +00:00
Treehugger Robot
2231df8a54 Merge changes from topic "b/278060169"
* changes:
  Replace touch -a with comment
  BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration
2023-05-23 08:56:48 +00:00
Jeongik Cha
43aaa8989e BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration am: d0b037235d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23378947

Change-Id: I0fef5b60fe9f2aeeff7d09b55901782f3fcd8df2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 02:07:17 +00:00
Jeongik Cha
d0b037235d BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration
* Extract BUILD_NUMBER, BUILD_HOSTNAME to file to avoid kati change
* Handle FILE_NAME_TAG_PLACEHOLDER string in dist in build/make/packaging/distdir.mk

Ignore-AOSP-First: there are internal use cases of FILE_NAME_TAG
Test: check if kati isn't invoked even though BUILD_NUMBER, BUILD_HOSTNAME
  is changed
Test: m && m, and check if the second m is no-op
Bug: 278060169
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7b40aa8338ba85a58ee481fe6bafac2959f7112b)
Merged-In: I1b37760242853c1a145bad255d0bb15524234b25
Change-Id: I1b37760242853c1a145bad255d0bb15524234b25
2023-05-22 22:42:07 +00:00
Jeongik Cha
05210f96b3 BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration
* Extract BUILD_NUMBER, BUILD_HOSTNAME to file to avoid kati change
* Handle FILE_NAME_TAG_PLACEHOLDER string in dist in build/make/packaging/distdir.mk

Test: check if kati isn't invoked even though BUILD_NUMBER, BUILD_HOSTNAME
  is changed
Test: m && m, and check if the second m is no-op
Bug: 278060169
Change-Id: I1b37760242853c1a145bad255d0bb15524234b25
Merged-In: I1b37760242853c1a145bad255d0bb15524234b25
2023-05-23 07:14:22 +09:00
Anton Hansson
cf253d7493 Merge "Don't add build ID to version name" am: 08b97147ac am: 9ef02252a6 am: 7c0628b3b8
Original change: https://android-review.googlesource.com/c/platform/build/+/2594246

Change-Id: I1524e96a2739246e3436a1e2d1e292d97eebbb79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 19:44:56 +00:00
Anton Hansson
68af924f54 Don't add build ID to version name
There is no clear reason why this should be done, and there is evidence
of it causing confusion & minor problems.

Bug: 186432595
Test: m nothing & grep AppsDefaultVersionName out/soong/soong.variables
Change-Id: I46243b4cfb3b23f2229bc1275c6ee96c1cee01d3
2023-05-17 09:19:11 +00:00
Treehugger Robot
ac7c99f04c Merge "Strip values of soong_config_set calls" am: e5e5642ba5 am: f739318a1a am: a46b724fa1
Original change: https://android-review.googlesource.com/c/platform/build/+/2592246

Change-Id: Id9220bc40ab4d2f08b9b3acc4f9b46f232f02db6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 00:19:41 +00:00
Cole Faust
76c2fcb90e Strip values of soong_config_set calls
It's a common mistake in make to have leading/trailing whitespace
on values, so strip it out before assigning to variables.

Bug: 282824346
Test: Presubmits
Change-Id: If4d3b86795c05ba32006af3af8031ca083a4c54b
2023-05-16 10:53:05 -07:00
Treehugger Robot
7c953e9ccb Merge "Also disable dexpreopt for boot images for unbundled builds." am: 081bad48eb am: 52d9e9bb7f am: 20e560fde3
Original change: https://android-review.googlesource.com/c/platform/build/+/2583331

Change-Id: Id537f9461b539d61c85c823723eb4621e456c14a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 20:22:58 +00:00
Jiakai Zhang
c74a4011e2 Also disable dexpreopt for boot images for unbundled builds.
This fixes the tradefed build error caused by aosp/2582191.

Bug: 280440941
Test: `BUILD_BROKEN_DISABLE_BAZEL=true m dist` on tradefed branch.
Change-Id: I34c9fea0a5f7110c9b2bda1986df82afa3eafc79
2023-05-10 13:54:50 +01:00
Treehugger Robot
b981ba578c Merge "Remove config for 64-bit binder ABI" am: 8844e4f145 am: 03ceb1b56e am: be7574828c
Original change: https://android-review.googlesource.com/c/platform/build/+/2553826

Change-Id: Ia0c75f07b9ac519460a05ae00b2de9a73f8abc6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 00:09:38 +00:00
Treehugger Robot
8844e4f145 Merge "Remove config for 64-bit binder ABI" 2023-05-01 21:32:30 +00:00