LaMont Jones
c25b45164b
Merge "Allow product-specific release configs." into main am: 6a39bb136e
am: 358a84d714
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3114502
Change-Id: I41bf51b17d2d9793b03cbd53e80f37c7be8db17c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 00:38:28 +00:00
LaMont Jones
358a84d714
Merge "Allow product-specific release configs." into main am: 6a39bb136e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3114502
Change-Id: I2bdfb6363ca1c7b60035fd2aa1dde7f5906918b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 00:22:52 +00:00
LaMont Jones
6a39bb136e
Merge "Allow product-specific release configs." into main
2024-06-05 00:07:28 +00:00
Cole Faust
2ccea368f6
Merge "Remove unused variables in soong variables file" into main am: d816a727b8
am: b5b8902b29
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3114139
Change-Id: I8b0306090b6fc98556c1519741f93533b04a9a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 23:07:36 +00:00
Cole Faust
b5b8902b29
Merge "Remove unused variables in soong variables file" into main am: d816a727b8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3114139
Change-Id: Ic95341bfc82d33b117ba760d9d87340873111085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 22:51:24 +00:00
Cole Faust
d816a727b8
Merge "Remove unused variables in soong variables file" into main
2024-06-04 22:23:09 +00:00
Treehugger Robot
9861b785c1
Merge "Reland "check_elf_file: check prebuilts are aligned"" into main am: 69e8c9be5f
am: 9830e817d6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3110301
Change-Id: I482fad100593b127dd8fb9e35bdabcfc4cfcd123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 22:11:33 +00:00
Treehugger Robot
9830e817d6
Merge "Reland "check_elf_file: check prebuilts are aligned"" into main am: 69e8c9be5f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3110301
Change-Id: I53a7274547eb1731191a5ea4690d4627926f9e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 21:47:36 +00:00
LaMont Jones
0ca61ddb25
Allow product-specific release configs.
...
Bug: 343794062
Test: manual
Change-Id: Ieb47ce685c7f29c0e8afe8897f86ffebb6318396
2024-06-04 14:26:49 -07:00
LaMont Jones
391609c3bf
Merge "Require protobuf for build flags" into main
2024-06-04 21:18:21 +00:00
Treehugger Robot
bd9e028af3
Merge "DO NOT MERGE ANYWHERE Revert "Require protobuf for build flags"" into main
2024-06-04 19:05:05 +00:00
LaMont Jones
2ef7438ff5
Require protobuf for build flags
...
This change forces build flags from .scl to .textproto format.
This change resubmits commit 8663122eac
such that it will merge downstream.
Bug: 328495189
Bug: 338450506
Test: manual, TH
Ignore-AOSP-First: DNMA in aosp-main to avoid aosp-main-future
Change-Id: I024f620b55e5e655f2b7b4764b217744334f7995
2024-06-04 11:45:53 -07:00
Cole Faust
58c46179b7
Remove unused variables in soong variables file
...
Test: Presubmits
Change-Id: I9c303c4dab9ad18653cda7ca62ec8884d044bba0
2024-06-04 11:10:59 -07:00
Steven Moreland
52c2371ae8
Reland "check_elf_file: check prebuilts are aligned"
...
This reverts commit 411fb17537
.
Reason for revert: reland after other targets are fixed b/342466032
Bug: 342466032
Test: build, w/ and w/o checking enabled
Change-Id: I830166faffec781cf6cc4fea47140a60b0a12466
2024-06-04 17:26:12 +00:00
Jim Tang
39d190e7c3
Add license metadata declaration in device/generic/goldfish
...
Bug: 343823190
Test: presubmit
Change-Id: I112061067ff7cb6dc6894a798dc4edf51918b5ea
2024-06-04 22:22:45 +08:00
Herbert Xue
8a61b7f5ba
Include sdk-preprocess-files.mk before process sdk.atree
...
Bug: 336709919
Test: m sdk
Change-Id: Id0ad404f576478a6909eb440f3fb259606d57d02
2024-06-04 20:05:11 +08:00
Nelson Li
fd6406c066
Convert appcompat.sh to a Python binary
...
Previously, to use `appcompat.sh`, we hardcoded absolute paths for many
dependencies in the `build/core/definitions.mk` file, and the same was
done in `art/tools/veridex/Android.mk`.
This change converts `appcompat.sh` to `appcompat.py` and packages the
necessary files into a `Python binary`. This not only resolves the
issue of hardcoding absolute dependency paths but also allows users to
use the tool directly without having to specify dependency paths,
making it more convenient.
Bug: 343105310
Test: 1. m appcompat
2. m CarrierConfig (any module with appcompat)
3. appcompat --dex-file=<apk path>
Change-Id: I6215f42241f58ba7fc6f4ae5846c4b71d9c1be4f
2024-06-04 03:34:27 +00:00
Steven Moreland
fb92bbdcd1
Shipping_api_level
...
Make it pretty in blueprint.
Bug: 340953047
Test: N/A
Change-Id: I68d1e891578afe2581e760b6a025e8280c3cb833
2024-06-04 03:21:07 +00:00
Ronald Braunstein
65f6aa6ba4
Merge "Reapply "Add soong installed files to general-tests.zip"" into main am: 68452cdcce
am: 173298547b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3111079
Change-Id: Ibc84773c742c6a01c5997a1dec1def34b383092b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-03 23:11:21 +00:00
Ronald Braunstein
173298547b
Merge "Reapply "Add soong installed files to general-tests.zip"" into main am: 68452cdcce
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3111079
Change-Id: I94c5fcd5952eaa54fc34f4ee9aba5933f25c43a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-03 23:03:07 +00:00
Ronald Braunstein
68452cdcce
Merge "Reapply "Add soong installed files to general-tests.zip"" into main
2024-06-03 22:54:57 +00:00
Vilas Bhat
e8bec60526
Propagate libpower no lock during binder transaction flag to soong
...
Bug: 343527537
Test: (On internal branch)
lunch, make and flash Pixel 8 target
atest libpower_test
Change-Id: I8fabec0919e180b0e3c65f06280032fc5eea37dc
2024-06-03 22:25:20 +00:00
LaMont Jones
d0b3b82d20
DO NOT MERGE ANYWHERE Revert "Require protobuf for build flags"
...
This reverts commit 8663122eac
.
Reason for revert: Was DNMA aosp/main with same ChangeId. Will resubmit with new one, so that it actually merges.
Change-Id: Ifa1b3b3901b88882f5ea790b0cc582bd828a8619
2024-06-03 22:05:14 +00:00
LaMont Jones
c58de8fbb3
Merge "Require protobuf for build flags" into main
2024-06-03 20:37:27 +00:00
Steven Moreland
066ad556ab
Merge "Android builds default to 64-bit." into main am: 48c53d600e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3109067
Change-Id: I69fb3c0342d84e5eac60e03ddce22ab350f23f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-03 18:37:07 +00:00
Steven Moreland
48c53d600e
Merge "Android builds default to 64-bit." into main
2024-06-03 18:32:26 +00:00
Ronald Braunstein
b86f9ef159
Reapply "Add soong installed files to general-tests.zip"
...
This reverts commit f2685e5ccf
.
Original commit broke building sdk/ndk in post submit.
Fixed with small patch in build/soong
Test: m general-tests
Test: IST_DIR=/usr/local/google/dist/bug TARGET_RELEASE=trunk_staging TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true packages/modules/common/build/mainline_modules_sdks.sh
Change-Id: I47e39913878219adec6471a474e3c238c4bdeed1
2024-06-02 07:21:37 -07:00
Treehugger Robot
6861c4e538
Merge "Enable <uses-library> check for WTS" into main am: bbce78d721
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3109347
Change-Id: Idef740bdafd2d3d028ee1c3120aea773f234719c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-01 01:09:45 +00:00
Treehugger Robot
bbce78d721
Merge "Enable <uses-library> check for WTS" into main
2024-06-01 01:02:59 +00:00
Yingzhe Li
6f29441e37
Enable <uses-library> check for WTS
...
<uses-library> checks are disabled on test suites by default. There were
changes merged in WTS that broke regular device build due to the lack of
this check in WTS.
This change adds such check to WTS.
Bug: 341311669
Test: m wts; verifies <uses-library> check is executed
Change-Id: Iafb10c15cf3569c500c46354f81325f0d834e0aa
2024-05-31 23:56:05 +00:00
Priyanka Advani
4a6c4b076d
Merge "Revert "Add soong installed files to general-tests.zip"" into main am: cfb51aa499
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3109351
Change-Id: I9dcf300af6407f9a42827a417417970e739adecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-31 23:43:54 +00:00
Priyanka Advani
cfb51aa499
Merge "Revert "Add soong installed files to general-tests.zip"" into main
2024-05-31 23:39:49 +00:00
Priyanka Advani
f2685e5ccf
Revert "Add soong installed files to general-tests.zip"
...
Revert submission 3060229-ron-tmc-symlinks
Reason for revert: Droidmonitor created revert due to b/344045516
Reverted changes: /q/submissionid:3060229-ron-tmc-symlinks
Change-Id: Ic471df68c3ebdeb368eac9549446ee50b17d7c2f
2024-05-31 23:31:17 +00:00
Ronald Braunstein
7d64251134
Merge "Add soong installed files to general-tests.zip" into main am: 279204f0c9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3066804
Change-Id: I0c8cc58b7977a1b36b04905bf06b071b4590daa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-31 23:03:11 +00:00
Ronald Braunstein
279204f0c9
Merge "Add soong installed files to general-tests.zip" into main
2024-05-31 22:58:10 +00:00
Priyanka Advani
9b6857d6f8
Merge "Revert "check_elf_file: check prebuilts are aligned"" into main am: 8d5b8c1f98
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3110411
Change-Id: I25ab04d528185a17f3f82b089b1292a97a9d65fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-31 22:37:38 +00:00
Priyanka Advani
8d5b8c1f98
Merge "Revert "check_elf_file: check prebuilts are aligned"" into main
2024-05-31 22:27:08 +00:00
Priyanka Advani
411fb17537
Revert "check_elf_file: check prebuilts are aligned"
...
This reverts commit 432bd660dc
.
Reason for revert: Droidmonitor created revert due to breakage in b/344033120
Change-Id: I40f3e1becf3e7d944fdc868bd4000d7602db1d15
2024-05-31 22:14:22 +00:00
Steven Moreland
b716e006ed
Merge "check_elf_file: check prebuilts are aligned" into main am: 26bb2346de
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3101471
Change-Id: I29118e75b78ccfbfcc1b69640d0f2078804e21d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-31 22:11:13 +00:00
Steven Moreland
26bb2346de
Merge "check_elf_file: check prebuilts are aligned" into main
2024-05-31 22:02:55 +00:00
Joe Onorato
884f91d424
Merge "Rename _all_release_configs so it's more accessible for list_releases command" into main am: 4c825353f9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3109688
Change-Id: I6d908f2ae66c5f40b2801896edc544fdacab9f98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-31 20:27:00 +00:00
Steven Moreland
c89cf9628b
Android builds default to 64-bit.
...
Some people don't specify what they build. This came up on
some host tools target, and there were some interactions.
Anyway, 64-bit is in, 32-bit is out. Cheers.
Bug: N/A
Test: N/A
Change-Id: I69ab62d88011df90874e4ba05ee34b61805911e0
2024-05-31 20:23:16 +00:00
Joe Onorato
4c825353f9
Merge "Rename _all_release_configs so it's more accessible for list_releases command" into main
2024-05-31 20:22:06 +00:00
LaMont Jones
8663122eac
Require protobuf for build flags
...
This change forces build flags from .scl to .textproto format.
Bug: 328495189
Bug: 338450506
Test: manual, TH
Ignore-AOSP-First: DNMA in aosp-main to avoid aosp-main-future
Merged-In: Ia33aae158d62c12666d97449cea0c02b60550a21
Change-Id: Ia33aae158d62c12666d97449cea0c02b60550a21
2024-05-31 11:24:50 -07:00
LaMont Jones
ec11bca5c3
Merge "DO NOT MERGE ANYWHERE Require protobuf for build flags" into main
2024-05-31 16:10:37 +00:00
Ronald Braunstein
523696e964
Add soong installed files to general-tests.zip
...
The module `test_module_config` will be installing symlinks in the
testcases directory pointing back to the `base` test for .apk files.
This saves a gigs of space on disk and in suite zip files.
However, the .mk files were using LOCAL_COMPATIBILITY_SUPPORT_FILE to
do two things:
1) copy the file from intermediates to testcases
2) package the testcases files in zips.
Because the test_module_config rule is taking care of 1), we need a new
variable to do just 2)
Test: m general-tests device-tests
Change-Id: Icdad4401cde27d8edd5e13e486b96c62817a4bbb
2024-05-31 08:23:08 -07:00
Treehugger Robot
e8d3b0147c
Merge "Use generated pvmfw_embedded_key_pub_bin" into main am: 6d52c945d5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3101342
Change-Id: I16fc8a2f2d00544ef28a75dc30f483682a677f40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-31 09:18:41 +00:00
Treehugger Robot
6d52c945d5
Merge "Use generated pvmfw_embedded_key_pub_bin" into main
2024-05-31 09:09:31 +00:00
Yihan Dong
c28c06c89a
Merge "Collect xTS jar/apk packages from soong intermediate dirs" into main am: 69fe181b1d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3105340
Change-Id: I5ea7ea5dde42a0f99b828bb92c95616dd75ae803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-05-31 08:55:48 +00:00
Yihan Dong
69fe181b1d
Merge "Collect xTS jar/apk packages from soong intermediate dirs" into main
2024-05-31 08:46:25 +00:00