Commit graph

89793 commits

Author SHA1 Message Date
Treehugger Robot
4fd3b11018 Merge "Remove emulator_x86_arm board from common boards" into main 2023-10-27 22:36:11 +00:00
Treehugger Robot
3006f169b5 Merge "Fix tapas for git_main builds" into main 2023-10-27 19:56:40 +00:00
Treehugger Robot
61f81a68d8 Merge "Make non-ab code path compatible with extracted target files" into main 2023-10-27 19:32:48 +00:00
Alfred Piccioni
bd523029a9 Remove emulator_x86_arm board from common boards
The board will now live in the Android TV vendor partition, since the
emulator team is no longer supporting 32-bit boards.

Bug: 305610937
Test: Null
Change-Id: Ia1afb35ad15eb991bb2451c160db4f853f016587
Merged-In: Ia1afb35ad15eb991bb2451c160db4f853f016587
2023-10-27 18:58:37 +00:00
Kelvin Zhang
2ab6986dd9 Make non-ab code path compatible with extracted target files
Bug: 296485685
Test: ota_from_target_files -v -i non_ab.zip non_ab.zip ota.zip
Change-Id: I13ed54bfe7d14d2d1e87f45564da465a77bc2d1d
2023-10-27 11:01:27 -07:00
Treehugger Robot
a997e48000 Merge "De-duplicate kernel module names" into main 2023-10-26 19:02:38 +00:00
Greg Kaiser
83ed159cf7 Fix tapas for git_main builds
In the git_main trunk stable builds, we're required to have a
TARGET_RELEASE set.

For now, we hard-code this to "trunk_staging" (and leave a TODO
to accept this as a function argument).

This will have us producing valid builds under git_main.

Bug: 307975293
Test: 'tapas google-tradefed-all' now works on a tree that has go/aog/2806253
Change-Id: I70572fb4c7902350513e251694f3ddef91efcb13
2023-10-26 18:38:35 +00:00
Kelvin Zhang
57f23bf317 De-duplicate kernel module names
If BOARD_KERNEL_MODULES_16K contains duplicate kernel modules under
different directories, build will fail with 'multiple overriding
commands error' . To fix it, de-dup BOARD_KERNEL_MODULES_16K base on the
basename of kernel modules files.

Test: th
Change-Id: I45d850d5b3804c54b9ec0133d3a657c2db5adb17
2023-10-26 10:29:55 -07:00
Ted Bauer
6866204083 Merge "Revert "Do not generate aconfig_flags.textproto"" into main 2023-10-26 16:46:57 +00:00
Ted Bauer
49fbb31fcf Revert "Do not generate aconfig_flags.textproto"
This reverts commit 0ac5304598.

Reason for revert: unbreak FlagFlipper

Test: m
Change-Id: I3c00d97bcb39d50a54b46fb61eaa30e8fcb0c9a5
2023-10-26 10:59:34 -04:00
Treehugger Robot
3d79e54ff1 Merge "Fix lunch choices for git_main" into main 2023-10-25 22:24:57 +00:00
Treehugger Robot
07f84b7b17 Merge "Use deterministic salt for AVB footer of prebuilt boot img" into main 2023-10-25 21:40:19 +00:00
Greg Kaiser
0fe27f448b Fix lunch choices for git_main
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are
valid in the trunk stable setup.

Bug: 307738446
Test: lunch
Change-Id: I7d56b288355d1335db5297ad9b5117054caf365b
2023-10-25 21:28:57 +00:00
Kelvin Zhang
160762a276 Use deterministic salt for AVB footer of prebuilt boot img
When target specified a prebuilt boot.img, current build system will add
avb hash footer to it with a random salt. Use a deterministic salt
instead for more reproducible builds. To stay consistent with
non-prebuilt boot.img code path, we extract the kernel image from
prebuilt boot.img and uses sha256sum of kernel image as the salt.

Test: th
Bug: 293313353
Change-Id: I988999ddc4f18e0b8677b05a3165c847b6a11b52
2023-10-25 13:28:11 -07:00
Greg Kaiser
6787354f96 Merge "Have default 'lunch' target use a release type" into main 2023-10-25 20:19:37 +00:00
Wei Li
b3731e0db2 Merge "Add key character maps to layoutlib dist files" into main 2023-10-25 17:35:40 +00:00
Greg Kaiser
a13cd28e44 Have default 'lunch' target use a release type
In git_main, the correct target here is aosp_arm-trunk_staging-eng
(or "trunk_food" or "next", but we choose the most generic
"trunk_staging").

Bug: 307738446
Test: "lunch", hit return for the default, "echo $TARGET_RELEASE" to confirm
Change-Id: I4d4bcaf27553976e64133c7351db296953f88b08
2023-10-25 16:18:45 +00:00
Kelvin Zhang
c87fd674a8 Merge "Allow -v option to change log level" into main 2023-10-25 04:59:01 +00:00
Kelvin Zhang
9d74128194 Allow -v option to change log level
Setting logging level to 'NOTSET' would tell logging module to inherit
logging level from handlers. Since the verbosity of handlers is
controlled by -v option, this allows sign_apex.py to give verbose output
if -v is specified.

Test: th
Bug: 307191956
Change-Id: I9c1db107cf4eae80ab570d892b0465b3902298fd
2023-10-24 21:58:28 -07:00
Jerome Gaillard
ea9dab478c Add key character maps to layoutlib dist files
This makes key character map files from the framework part of the
layoutlib artifacts so that they can be used in Android Studio to
handle platform key events.

Bug: 255328531
Test: N/A
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1894ff5c78ca33be85d983d28be42870bac0bed0)
Merged-In: I147159912f85daafc97364468d6a6c2cfa3916b8
Change-Id: I147159912f85daafc97364468d6a6c2cfa3916b8

NOTE FOR REVIEWERS - errors occurred while applying the patch.
PLEASE REVIEW CAREFULLY.
Errors:
Error applying patch in core/Makefile, hunk HunkHeader[7006,8->7006,8]: Hunk cannot be applied

Original patch:
 From 1894ff5c78ca33be85d983d28be42870bac0bed0 Mon Sep 17 00:00:00 2001
From: Jerome Gaillard <jgaillard@google.com>
Date: Mon, 24 Oct 2022 16:30:25 +0100
Subject: [PATCH] Add key character maps to layoutlib dist files

This makes key character map files from the framework part of the
layoutlib artifacts so that they can be used in Android Studio to
handle platform key events.

Bug: 255328531
Test: N/A
Change-Id: I147159912f85daafc97364468d6a6c2cfa3916b8
---
2023-10-25 01:15:53 +00:00
Baligh Uddin
4c09638237 Merge "Move most version variable out to relase configs." into main 2023-10-24 23:39:55 +00:00
Colin Cross
ea9d5cfbeb Merge "Make checkbuild depend on blueprint_tests" into main 2023-10-24 22:21:18 +00:00
Colin Cross
66a01781f9 Merge "Add aninja to envsetup.sh" into main 2023-10-24 21:53:11 +00:00
Colin Cross
df85b8691e Make checkbuild depend on blueprint_tests
The Soong tests are being disabled by default, add them as a manual
dependency of checkbuild to esnure they still run in CI.

Bug: 269296618
Test: aninja -t path checkbuild out/host/linux-x86/bin/go/soong-java/test/test.passed
Change-Id: Ice9b5ecdef8455cd0b173edbac141861cffc28c1
2023-10-24 10:59:40 -07:00
Colin Cross
71319726df Add aninja to envsetup.sh
Add an aninja function to envsetup.sh that can run ninja with the
appropriate ninja file for an Android build.  Simplifies running
queries with ninja.  For example:
aninja -t query droid

Test: aninja -t query droid
Change-Id: I7064984d55054cd4350800cfd75bf6aaa1740e9d
2023-10-24 10:58:46 -07:00
Wei Li
420d7d5878 Merge "Initial implementation of layoutlib SBOM generation." into main 2023-10-24 17:11:20 +00:00
Anton Hansson
ef5a9ea7ef Merge "m framework-minus-apex should not build services" into main 2023-10-24 16:42:46 +00:00
Jeff Hamilton
426a9f8f02 Move most version variable out to relase configs.
This allows finer control of the version variables
per release config, and removes a lot of computed
logic in favor of just directly setting the values.

Bug: 306702353
Test: lunch <device>-next-userdebug && m -j98
Change-Id: I9edc7171d124f0cfa540fea6f0e06ba877910444
Ignore-AOSP-First: Changes in internal projects first.
Merged-In: I9edc7171d124f0cfa540fea6f0e06ba877910444
2023-10-24 16:41:58 +00:00
Mark White
cc8b4dd471 m framework-minus-apex should not build services
Bug: 288868053
Test: verified services not built in build.trace.gz
Ignore-AOSP-First: change in topic with internal-first projects
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:23c36d95196b7a5ebca2ee7c81a1ee169a912667)
Merged-In: I9ab58d551a7446e328412af27a94d760d6f0cb67
Change-Id: I9ab58d551a7446e328412af27a94d760d6f0cb67
2023-10-24 15:46:14 +00:00
Zhi Dou
79a45fa178 Merge "overrideflags: change local override list name" into main 2023-10-23 20:55:15 +00:00
Treehugger Robot
130bf250d2 Merge "sysprop: Remove commits to void build break" into main 2023-10-23 19:33:22 +00:00
Zhi Dou
b66973688e overrideflags: change local override list name
Change local override list name to "ACONFIG_VALUES_LIST_LOCAL".

Bug: 298692416
Test: source build/envsetup.sh && overrideflags, and then check the
output

Change-Id: I6c2b8dcf6291a1fd7012e714fa91ca6bf0b47cf2
2023-10-23 18:19:29 +00:00
Kelvin Zhang
9e348cfc6b Merge "Allow OEMs to bypass the on device SPL downgrade check" into main 2023-10-23 18:17:59 +00:00
Zhi Dou
74510e14fb Merge "change path to shell_utils.sh" into main 2023-10-23 17:18:15 +00:00
Kelvin Zhang
d51332c82f Allow OEMs to bypass the on device SPL downgrade check
Certain OEMs bootloader implementation allow SPL downgrade. Allow on
device SPL downgrade check to be bypassed.

Test: th
Bug: 306271739
Change-Id: Iba991e12d36291e2d0547c94ef54c750d87f35fb
2023-10-23 10:10:33 -07:00
Zhi Dou
8817eed1af change path to shell_utils.sh
Bug: 298692416
Test: source build/envsetup.sh && overrideflags, and then check the
output

Change-Id: Idf254b66da17079db2d08e98a9914e1c2f9f6097
2023-10-23 13:41:07 +00:00
Mitch Phillips
2d57e36a39 Merge "Diable memtag_stack on fullmte builds." into main 2023-10-23 10:28:44 +00:00
Master
08f6715f37 sysprop: Remove commits to void build break
Reason: while building it cause echo to break, and hence props are not set
Change-Id: I7bed0e01cc71cbe37888f9d407569f8e1477d0f2
2023-10-21 04:20:14 +00:00
LaMont Jones
6aa030026c Merge "add script to help override flag value locally" into main 2023-10-20 22:24:24 +00:00
Zhi Dou
77c9f0c9cb add script to help override flag value locally
Add a script to help to create flag value building rules.

The script will only extract necessary information from the value file
but it will not validate the file. The validation will defer to building
system.

For input

```
flag_value {
    package: "com.android.aconfig.test"
    name: "disabled_ro"
    state: DISABLED
    permission: READ_ONLY
}
flag_value {
    package: "com.android.demoapp.test"
    name: "enabled_ro"
    state: DISABLED
    permission: READ_WRITE
}
flag_value {
    package: "com.android.aconfig.test"
    name: "enabled_rw"
    state: ENABLED
    permission: READ_WRITE
}
```

The output Android.bp file will be like
```
VALUE_LIST_LIST = [
    aconfig-local-com.android.demoapp.test,
    aconfig-local-com.android.aconfig.test
]

aconfig_values {
    name: "aconfig-local-com.android.demoapp.test",
    package: "com.android.demoapp.test",
    srcs: [
        "override_values.textproto",
    ]
}

aconfig_values {
    name: "aconfig-local-com.android.aconfig.test",
    package: "com.android.aconfig.test",
    srcs: [
        "override_values.textproto",
    ]
}
```

Bug: 298692416
Test: source build/envsetup.sh && overrideflags, and then check the
output

Change-Id: Ife4063e079811e0b29046be7a6bc127cad668ed0
2023-10-20 21:04:00 +00:00
Treehugger Robot
9bfce20efd Merge "Add special paths for BoardConfig.mk for gf and cf" into main 2023-10-20 20:42:32 +00:00
Roman Kiryanov
8cc6b1181e Add special paths for BoardConfig.mk for gf and cf
goldfish and cuttlefish are emulator and have
many boards which makes their device folders
very crowded. This change will allow to move
all boards into a dedicated folder.

This change will go away once a more consistent
approach to search for board configurations is
implemented.

Bug: 295259752
Test: presubmit
Change-Id: I78efe5a0ecd1ca9cffbadc7d7112f50e444ff7c3
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-10-20 12:05:38 -07:00
Mitch Phillips
1f1bff9701 Diable memtag_stack on fullmte builds.
memtag_stack currently has a miscompile on main that prevents boot. Diable memtag_stack on fullmte builds until a new toolchain gets rolled that has the fixes.

Bug: 292478827
Bug: 301328082
Change-Id: I59af848b556088d71971dd1b6d7cc02ef61641b6
Test: Build and boot fullmte off main.
2023-10-20 16:58:01 +00:00
Juan Yescas
4d136f5265 Merge "16k: Sign the APKs to support 4k/16k page sizes" into main 2023-10-20 04:09:43 +00:00
Juan Yescas
5c6b6f24a3 16k: Sign the APKs to support 4k/16k page sizes
The page agnostic targets have to support 4k/16k page sizes. For
these targets, the APKs have to be aligned at 16k boundaries.

Bug: 302343940
Test: source build/envsetup.sh
      lunch aosp_cf_arm64_phone_pgagnostic
      m
      launch_cvd -userdata_format=ext4
Change-Id: Ia0e39a90c0d6a3e62d450157fdfd5e3ee36d346e
2023-10-20 03:13:39 +00:00
Wei Li
ee7365981e Merge "Support third_party.identifier in METADATA files of external packages." into main 2023-10-20 01:48:33 +00:00
Cole Faust
2fc2709115 Merge "Revert^2 "Enable genrule sandboxing by default"" into main 2023-10-19 23:10:55 +00:00
Thiébaud Weksteen
ed5abbdea4 Merge "Revert "Add sign_sepolicy_path for a binary to sign sepolicy.apex."" into main 2023-10-19 22:48:25 +00:00
Sandeep Dhavale
cc1a560241 Merge "Add support for specifying erofs blocksize" into main 2023-10-19 21:46:58 +00:00
Cole Faust
3feef71409 Merge "Add PRODUCT_PACKAGES to soong.variables" into main 2023-10-19 18:04:08 +00:00