Commit Graph

97168 Commits

Author SHA1 Message Date
Ting-Hsin Chen
d4f62a9389 Merge "Revert "Convert BuildIgnoreApexContritbutions variable to a boolean"" into main am: d14e178b79
Original change: https://android-review.googlesource.com/c/platform/build/+/3009974

Change-Id: I7dee91fec1ae73a526e7bb22638be0dcfc1c8c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 06:39:13 +00:00
Ting-Hsin Chen
d14e178b79 Merge "Revert "Convert BuildIgnoreApexContritbutions variable to a boolean"" into main 2024-03-22 06:20:17 +00:00
Android Culprit Assistant
c7220c4877 Revert "Convert BuildIgnoreApexContritbutions variable to a boolean"
This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/53721efb-c49e-4ce8-b96c-fd03598b4202).

Change-Id: Ifb82b8ec92b3ba8ad5da63ba497e4daad8093e4b
2024-03-22 06:15:54 +00:00
Spandan Das
6375efa642 [automerger skipped] Merge "Convert BuildIgnoreApexContritbutions variable to a boolean" into main am: 4786d0ad3d am: acd2471e5e -s ours
am skip reason: Merged-In If899f6eaf5449c2aa789d0bd5b791a3db715c676 with SHA-1 133f72f6dc is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/3008093

Change-Id: I1cb9266aee95739dd4ca0ab3d4397a93876d58cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 02:53:17 +00:00
Spandan Das
acd2471e5e Merge "Convert BuildIgnoreApexContritbutions variable to a boolean" into main am: 4786d0ad3d
Original change: https://android-review.googlesource.com/c/platform/build/+/3008093

Change-Id: I89cc9301c7bee21ff0e6f1577ac99345cb017471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-22 02:52:34 +00:00
Spandan Das
4786d0ad3d Merge "Convert BuildIgnoreApexContritbutions variable to a boolean" into main 2024-03-22 02:32:45 +00:00
Lee Shombert
a64ebbdad3 Export the sqlite build flag to more products
sqlite is used in many products, including the Android system,
mainline modules, and sdks.  The trunk-stable build flag must be
exported to all of these targets.

Bug: 323176655

Change-Id: I23480610b710c0ec3e49c364c179ea76297fb494
2024-03-21 16:08:50 -07:00
Daniel Zheng
d8495067fa Merge "Revert "allow command line override"" into main am: bd61eeecd7 am: 7bc9c25ca2
Original change: https://android-review.googlesource.com/c/platform/build/+/3009494

Change-Id: I7b88ca60453a5e6f4fa34e93876c785d589219df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-21 21:40:20 +00:00
Elliott Hughes
53503ccf97 Merge "envsetup.sh: explain _why_ there's an adb function in here." into main am: 4e1a3498c1 am: 7a04506d76
Original change: https://android-review.googlesource.com/c/platform/build/+/3001072

Change-Id: I3176b8cfb219facbc00043600499e649f6c8538f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-21 21:39:18 +00:00
Daniel Zheng
7bc9c25ca2 Merge "Revert "allow command line override"" into main am: bd61eeecd7
Original change: https://android-review.googlesource.com/c/platform/build/+/3009494

Change-Id: Iaafd75e2ba7ee31476e1d71017e185cac247ea8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-21 21:21:29 +00:00
Elliott Hughes
7a04506d76 Merge "envsetup.sh: explain _why_ there's an adb function in here." into main am: 4e1a3498c1
Original change: https://android-review.googlesource.com/c/platform/build/+/3001072

Change-Id: I6bb10700d4775b3d0723a54e6756adb196be7e73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-21 21:20:48 +00:00
Daniel Zheng
bd61eeecd7 Merge "Revert "allow command line override"" into main 2024-03-21 21:19:30 +00:00
Daniel Zheng
02393ee106 Revert "allow command line override"
This reverts commit f3d476ed40.

Reason for revert: b/330767621

Change-Id: Ia0b8ec3f177ae74c03d7cb4e568e44149b125617
2024-03-21 21:08:22 +00:00
Elliott Hughes
4e1a3498c1 Merge "envsetup.sh: explain _why_ there's an adb function in here." into main 2024-03-21 20:40:33 +00:00
Daniel Zheng
3cad2a5ed6 Merge "allow command line override" into main am: 62ca754567 am: 8ae8dfed7f
Original change: https://android-review.googlesource.com/c/platform/build/+/2995256

Change-Id: Ie4aefd8ef7a75f1760aa8c918b0fb015c7fa57a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-21 20:13:45 +00:00
Daniel Zheng
8ae8dfed7f Merge "allow command line override" into main am: 62ca754567
Original change: https://android-review.googlesource.com/c/platform/build/+/2995256

Change-Id: Iaf9a2e944822de69b15040af8e96da43616405c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-21 19:58:24 +00:00
Daniel Zheng
62ca754567 Merge "allow command line override" into main 2024-03-21 19:28:30 +00:00
Spandan Das
b20d060c3c Convert BuildIgnoreApexContritbutions variable to a boolean
The ignore list is burdensome to maintain once we start adding the
module sdk contents to apex_contributions. Convert the variable to a
boolean. When set to true, all contents in `apex_contributions` will be
ignored

Bug: 308187268
Test: m nothing on aosp,google and google_fullmte devices
Ignore-AOSP-first: CL topic does a cleanup of an internal only denylist

Change-Id: If899f6eaf5449c2aa789d0bd5b791a3db715c676
Merged-In: If899f6eaf5449c2aa789d0bd5b791a3db715c676
(cherry picked from commit 025492c4ea092b7f25a4d442e67143954b5ffaa5)
2024-03-21 18:04:25 +00:00
Spandan Das
962f544e33 Merge "Convert BuildIgnoreApexContritbutions variable to a boolean" into main 2024-03-21 18:02:14 +00:00
Spandan Das
133f72f6dc Convert BuildIgnoreApexContritbutions variable to a boolean
The ignore list is burdensome to maintain once we start adding the
module sdk contents to apex_contributions. Convert the variable to a
boolean. When set to true, all contents in `apex_contributions` will be
ignored

Bug: 308187268
Test: m nothing on aosp,google and google_fullmte devices
Ignore-AOSP-first: CL topic does a cleanup of an internal only denylist

Change-Id: If899f6eaf5449c2aa789d0bd5b791a3db715c676
2024-03-21 18:01:07 +00:00
Daniel Zheng
f3d476ed40 allow command line override
Allow override for vabc_cow version if specified from the command line.
If OPTIONS.vabc_cow_version is already defined, then we don't want to
modify this value since it was defined by --vabc_compression_param=

Test: th
Change-Id: I57b8129faf5caf9de1dc8ad96e7570214a9f3313
2024-03-21 10:47:51 -07:00
Elliott Hughes
86e991710c envsetup.sh: explain _why_ there's an adb function in here.
This is what I came to do yesterday, but got distracted by the fact that it had been broken.

Change-Id: Ie3baf387c6c95a7302c1f6916c1557d486341cd8
2024-03-21 16:55:08 +00:00
Elliott Hughes
dc07f5973c Merge "Fix adb function." into main am: 31a9fee831 am: 2d165771fd
Original change: https://android-review.googlesource.com/c/platform/build/+/3006975

Change-Id: I156b17aba3d26b623e1328790ae5072ef909322d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-21 16:34:20 +00:00
Elliott Hughes
2d165771fd Merge "Fix adb function." into main am: 31a9fee831
Original change: https://android-review.googlesource.com/c/platform/build/+/3006975

Change-Id: I051e5ee43874fc7eef86d119be7b97b17063d13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-21 15:57:15 +00:00
Elliott Hughes
31a9fee831 Merge "Fix adb function." into main 2024-03-21 15:42:02 +00:00
Inseob Kim
6a35810856 Migrate buildinfo.sh script into Soong
To build system.img in Soong, we need all artifacts including
build.prop. This fully migrates buildinfo.prop file into Soong as a
first step to build build.prop on Soong.

Bug: 322090587
Test: compare build.prop before and after
Test: build multiple times and see build.prop isn't rebuilt
Change-Id: I0d5aab21a825cfe22f97a6834209f9df196625d9
2024-03-21 17:18:59 +09:00
Treehugger Robot
ff597c8cfb Merge "Remove BPTTOOL variable" into main am: a0f30662d0 am: 80f34a20b2
Original change: https://android-review.googlesource.com/c/platform/build/+/3007112

Change-Id: Iad85d31572dbb1738a65cf470c7e2c2babc452d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-21 02:45:01 +00:00
Treehugger Robot
80f34a20b2 Merge "Remove BPTTOOL variable" into main am: a0f30662d0
Original change: https://android-review.googlesource.com/c/platform/build/+/3007112

Change-Id: Ia9da0f4aca84d647bc55d2bd62096df7a6cb19d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-21 02:32:26 +00:00
Treehugger Robot
a0f30662d0 Merge "Remove BPTTOOL variable" into main 2024-03-21 02:15:56 +00:00
Dennis Shen
bb13bbb086 aconfig: update aconfig_storage_read_api
Previously we are ensuring that the public rust api to get mapped file
is safe as we are ensuring that the file being mapped has a permission
of 444. However, a file permission of 444 is not possible due to build
system needs to make file 644 while creating img files. Thus need to make the rust api to get mapped file unsafe.

In reality, this should have no impact. Because, even though the storage
files have a file permission of 644, they are on a RO partition like
system. So the files are not writable anyway. This is true for all the
containers (platform partitions and mainline modules) we know so far.

Bug: b/321077378
Test: atest aconfig_storage_read_api.test; atest
aconfig_storage_read_api.test.rust; atest
aconfig_storage_read_api.test.cpp

Change-Id: I643fe191e697a524e2303a32750f04c268f408fd
2024-03-21 01:44:02 +00:00
Treehugger Robot
e68bbe2074 Merge "Add 'origin' parameter to flag declarations" into main am: da552368e0 am: 57c2dcffe3
Original change: https://android-review.googlesource.com/c/platform/build/+/3008717

Change-Id: I230b60c6f3bc22b8d96d3136df30c5ed796c9258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-21 01:25:46 +00:00
Treehugger Robot
57c2dcffe3 Merge "Add 'origin' parameter to flag declarations" into main am: da552368e0
Original change: https://android-review.googlesource.com/c/platform/build/+/3008717

Change-Id: I4136328bad9ee424d737183a23cd4bee31ebb6d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-21 01:08:22 +00:00
Cole Faust
d49454acab Remove BPTTOOL variable
This is unused since aosp/2654584

Test: Presubmits
Change-Id: Idf9b17d4d3b59f5a19ff544dd95d740892743303
2024-03-20 18:05:54 -07:00
Treehugger Robot
da552368e0 Merge "Add 'origin' parameter to flag declarations" into main 2024-03-21 00:50:36 +00:00
Elliott Hughes
7e7ff75042 Fix adb function.
It was broken by the last change (because unlike `which adb`, `command
adb` does not search $PATH if there's already an entry in the hash).
No-one's noticed in almost a year, but this has caused (rare) confusion
in the past.

Bug: http://b/24473359
Change-Id: I6bbb207992449132ba8563a8bcf298256c599c0d
2024-03-20 17:23:40 -07:00
Treehugger Robot
c7877c8ec2 Merge "Fix typo" into main am: d5d876a9a9 am: 2f2475c65e
Original change: https://android-review.googlesource.com/c/platform/build/+/3008716

Change-Id: I437ac6033b081288fc437dbe807b615bd53581c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 23:48:46 +00:00
LaMont Jones
0cd4acf587 Merge "Defer "no such release config" error" into main am: 96377be2a2 am: 9eb881fefa
Original change: https://android-review.googlesource.com/c/platform/build/+/3008733

Change-Id: Ic36067c495eac4952033166766b7653c71939473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 23:48:16 +00:00
Treehugger Robot
2f2475c65e Merge "Fix typo" into main am: d5d876a9a9
Original change: https://android-review.googlesource.com/c/platform/build/+/3008716

Change-Id: I2d0d36337859d4cda104fdf574e3022879d9586b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 23:26:17 +00:00
LaMont Jones
9eb881fefa Merge "Defer "no such release config" error" into main am: 96377be2a2
Original change: https://android-review.googlesource.com/c/platform/build/+/3008733

Change-Id: Id427177622a8f10429567938e5269caff4430af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 23:26:00 +00:00
LaMont Jones
9ee098e25b Add 'origin' parameter to flag declarations
This will reduce toil on separating the build flags.

Bug: 330386250
Bug: 328495189
Test: manual
Change-Id: I819184738bd3603534bb5e54c4b6a3ecd0a81a90
2024-03-20 16:22:53 -07:00
Treehugger Robot
d5d876a9a9 Merge "Fix typo" into main 2024-03-20 23:21:15 +00:00
LaMont Jones
96377be2a2 Merge "Defer "no such release config" error" into main 2024-03-20 23:08:27 +00:00
Kelvin Zhang
0669b8eac2 Fix typo
Test: th
Bug: 329678555
Change-Id: I952c19f93484dad9e273afe1cd45a043a36a34ee
2024-03-20 13:58:15 -07:00
LaMont Jones
76452d8b40 Defer "no such release config" error
This allows product-specific release config maps to declare release
configs.

Bug: 328495189
Test: manual
Change-Id: I862f167062ee647af00a4ec7d4af2966c6be44a8
2024-03-20 12:24:21 -07:00
Gurpreet Singh
e0cab34797 [automerger skipped] Merge "Add respective modules to the list of individually toggleable modules." into main am: 497f02d8c0 am: 5022516a23 -s ours
am skip reason: Merged-In Ica19b306bdbd67a86d2cf73478d0f886f782118c with SHA-1 e14f4862bb is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/3008473

Change-Id: I76d34965eb8776ad4f51c43ebf111a58e04a29d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 18:13:46 +00:00
Treehugger Robot
72a2b8116f Merge "aconfig: update pb file location" into main am: 64134135c7 am: 478b65870a
Original change: https://android-review.googlesource.com/c/platform/build/+/3006695

Change-Id: I0b6aa55a730c02eef62397159ef0b42fd76ac1d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 18:12:56 +00:00
Luca Farsi
09263b51c1 Merge "Remove extra test targets from inside build script" into main am: 7ecb46b314 am: 2dca73d885
Original change: https://android-review.googlesource.com/c/platform/build/+/3002466

Change-Id: I8c8727867a1bc3908d7a9c7169d2bd4f3b89e37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 18:09:37 +00:00
Gurpreet Singh
5022516a23 Merge "Add respective modules to the list of individually toggleable modules." into main am: 497f02d8c0
Original change: https://android-review.googlesource.com/c/platform/build/+/3008473

Change-Id: I8abf6e7a3a93c6957c81bdf6bf4af1050fc5d4fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 18:07:15 +00:00
Treehugger Robot
478b65870a Merge "aconfig: update pb file location" into main am: 64134135c7
Original change: https://android-review.googlesource.com/c/platform/build/+/3006695

Change-Id: I607a7645b291c72ed5d46212bc7a874630df5545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 18:06:45 +00:00
Gurpreet Singh
497f02d8c0 Merge "Add respective modules to the list of individually toggleable modules." into main 2024-03-20 17:55:43 +00:00