Commit Graph

72226 Commits

Author SHA1 Message Date
Pratyush
ae1c06f8f6 Merge "Disable Hidden API Checks for ENG Builds" into main am: d938f83be1 am: f42fbcf6a1 am: e4b8ef7b74 am: 128acca18d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2666977

Change-Id: Id10c996315ff704e9eccecb3edc4c428f0017a18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-30 17:52:59 +00:00
Pratyush
128acca18d Merge "Disable Hidden API Checks for ENG Builds" into main am: d938f83be1 am: f42fbcf6a1 am: e4b8ef7b74
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2666977

Change-Id: Ic41a02102b316f5ef9fa5cb0bc35fd3347009b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-30 17:10:58 +00:00
Pratyush
e4b8ef7b74 Merge "Disable Hidden API Checks for ENG Builds" into main am: d938f83be1 am: f42fbcf6a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2666977

Change-Id: Ibda169ed382b9da136072a6d8c43aa272cb88994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-30 16:08:01 +00:00
Pratyush
f42fbcf6a1 Merge "Disable Hidden API Checks for ENG Builds" into main am: d938f83be1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2666977

Change-Id: I3fcd2d58a6102e87fe4b403320a53c88ab61a299
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-30 15:28:41 +00:00
Pratyush
d938f83be1 Merge "Disable Hidden API Checks for ENG Builds" into main 2023-07-30 13:57:36 +00:00
Pratyush
faec4db56f Disable Hidden API Checks for ENG Builds
For more discussions/details, please check internal CL ag/24145146

Bug: 289409213
BUg: 285976182
Test: Look for hiddenapi calls in build trace
Change-Id: Ia2780ee419b8da1418ba1c7a7d732712b7c2a322
2023-07-30 13:57:10 +00:00
Christopher Ferris
ff3e6ac3bd Merge "Allow ramdisk targets to set cflags/exclude_srcs." into main am: 6ff7d9e532 am: f2aebd5720 am: 0fc8e44b72 am: 8a8d00b130
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679377

Change-Id: Ia62de903e0f174b3aa0d2972ca0a0312e16b4320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 21:22:17 +00:00
Florian Mayer
3839f4058c Merge "Revert "[hwasan] remove workaround for fixed toolchain issue"" into main am: a09c4bf8cb am: 5e20af628f am: f176e3d19c am: ca4a41eeca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2680677

Change-Id: I45824a0352ecb752326cf066359ef4e2733b4122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 21:21:54 +00:00
Christopher Ferris
8a8d00b130 Merge "Allow ramdisk targets to set cflags/exclude_srcs." into main am: 6ff7d9e532 am: f2aebd5720 am: 0fc8e44b72
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679377

Change-Id: Ibb0f8f9ad4877cc2c94d39e7701c06c3e04cc7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 20:39:28 +00:00
Florian Mayer
ca4a41eeca Merge "Revert "[hwasan] remove workaround for fixed toolchain issue"" into main am: a09c4bf8cb am: 5e20af628f am: f176e3d19c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2680677

Change-Id: I6ca6b828ac4897be81efaba2a463002214554a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 20:38:18 +00:00
Treehugger Robot
c1c78af7bb Merge "Add test mode for java config modules" into main am: ecb4c6e4dc am: 7c7bdd2a02 am: afcd50174a am: a14b7bb760
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2680715

Change-Id: I1ba8993b7de6e5c0c6a5fe61d2b060202aebe098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:52:20 +00:00
Christopher Ferris
0fc8e44b72 Merge "Allow ramdisk targets to set cflags/exclude_srcs." into main am: 6ff7d9e532 am: f2aebd5720
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679377

Change-Id: I25bf9312679c9aa8742ddbca86f6a4386d67ee1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:51:20 +00:00
Spandan Das
8921c78190 Merge "Add GoStdlib mnemonic for special handling of ''" into main am: 0cc3d672ce am: a883f80732 am: 34e077d4c0 am: edde0fdade
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679529

Change-Id: I86a87c54c0d95fd22deb1528170fa52c0a58c080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:51:15 +00:00
Florian Mayer
f176e3d19c Merge "Revert "[hwasan] remove workaround for fixed toolchain issue"" into main am: a09c4bf8cb am: 5e20af628f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2680677

Change-Id: Iaf809bbfd7562ed11b115668991621f75afdbb20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:51:07 +00:00
Spandan Das
2150e96569 Merge changes Ie292173d,I23f14f83 into main am: 3671dcd39a am: 423603ac69 am: 2de8665bdc am: c18aa62db6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679533

Change-Id: I32f1f81f281f7f6719a692b99518c1575b65aaf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:51:02 +00:00
Colin Cross
5dd8133822 Merge "Delete the javac/classes directory after zipping it" into main am: 61bf9ef31e am: 4fe3eaee55 am: d7d745bad7 am: 361d28eb06
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2678497

Change-Id: I8951eb69f33ab3b758c02cba34086d11248e83bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:50:48 +00:00
Christopher Ferris
f2aebd5720 Merge "Allow ramdisk targets to set cflags/exclude_srcs." into main am: 6ff7d9e532
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679377

Change-Id: Ib5028db3549b624e33f54839848ec1d61287f975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:11:12 +00:00
Florian Mayer
5e20af628f Merge "Revert "[hwasan] remove workaround for fixed toolchain issue"" into main am: a09c4bf8cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2680677

Change-Id: I3a3578f629896bc360782aa6225813e438883776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:10:46 +00:00
Treehugger Robot
a14b7bb760 Merge "Add test mode for java config modules" into main am: ecb4c6e4dc am: 7c7bdd2a02 am: afcd50174a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2680715

Change-Id: Ie7d15aee3bc9ad24d7d082a85b746484fae25716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:10:25 +00:00
Spandan Das
edde0fdade Merge "Add GoStdlib mnemonic for special handling of ''" into main am: 0cc3d672ce am: a883f80732 am: 34e077d4c0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679529

Change-Id: I06072c93ac30f9657aa3a229c7283076c8c4b1b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:08:52 +00:00
Spandan Das
c18aa62db6 Merge changes Ie292173d,I23f14f83 into main am: 3671dcd39a am: 423603ac69 am: 2de8665bdc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679533

Change-Id: Ia5964837c1e1c14d9c8e32a1dc0c3c5ed4b330f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:08:37 +00:00
Colin Cross
361d28eb06 Merge "Delete the javac/classes directory after zipping it" into main am: 61bf9ef31e am: 4fe3eaee55 am: d7d745bad7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2678497

Change-Id: I5e6f2550e24884153a70d84cf8221c232490c441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 19:08:23 +00:00
Christopher Ferris
6ff7d9e532 Merge "Allow ramdisk targets to set cflags/exclude_srcs." into main 2023-07-28 19:02:48 +00:00
Florian Mayer
a09c4bf8cb Merge "Revert "[hwasan] remove workaround for fixed toolchain issue"" into main 2023-07-28 18:28:22 +00:00
Treehugger Robot
afcd50174a Merge "Add test mode for java config modules" into main am: ecb4c6e4dc am: 7c7bdd2a02
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2680715

Change-Id: I0df3c6ba4f4b8235aa7af5350aa9d083925cca53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:26:32 +00:00
Spandan Das
34e077d4c0 Merge "Add GoStdlib mnemonic for special handling of ''" into main am: 0cc3d672ce am: a883f80732
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679529

Change-Id: I204e013e0d0ad04e056905ff07ecb40255d51857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:26:15 +00:00
Spandan Das
2de8665bdc Merge changes Ie292173d,I23f14f83 into main am: 3671dcd39a am: 423603ac69
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679533

Change-Id: If178946d6cb4d6c3db6330804e586727ce9726e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:25:42 +00:00
Colin Cross
d7d745bad7 Merge "Delete the javac/classes directory after zipping it" into main am: 61bf9ef31e am: 4fe3eaee55
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2678497

Change-Id: I7dd9ac42475682b297d2233f94396e6f114dc6ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:24:55 +00:00
Treehugger Robot
7c7bdd2a02 Merge "Add test mode for java config modules" into main am: ecb4c6e4dc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2680715

Change-Id: I2c77dd9e0a368078d9f39d6195112198b738324d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:03:31 +00:00
Spandan Das
a883f80732 Merge "Add GoStdlib mnemonic for special handling of ''" into main am: 0cc3d672ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679529

Change-Id: Ibc393c8b7cd70dd5d94d1b9f44223cef34ee9f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 18:02:39 +00:00
Spandan Das
423603ac69 Merge changes Ie292173d,I23f14f83 into main am: 3671dcd39a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679533

Change-Id: Iae263087b4c66a615a47587d3f105adebca1ff38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 17:40:22 +00:00
Colin Cross
4fe3eaee55 Merge "Delete the javac/classes directory after zipping it" into main am: 61bf9ef31e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2678497

Change-Id: I0a28e92b94ccdf55307c2b97f18f1544fbdc452c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 17:39:34 +00:00
Treehugger Robot
ecb4c6e4dc Merge "Add test mode for java config modules" into main 2023-07-28 17:31:43 +00:00
Spandan Das
0cc3d672ce Merge "Add GoStdlib mnemonic for special handling of ''" into main 2023-07-28 16:26:57 +00:00
Spandan Das
3671dcd39a Merge changes Ie292173d,I23f14f83 into main
* changes:
  Panic if soongConfig and productConfig values do not match
  Check if soong_config_var propertystruct is zero before panicking
2023-07-28 16:26:44 +00:00
Colin Cross
61bf9ef31e Merge "Delete the javac/classes directory after zipping it" into main 2023-07-28 16:18:31 +00:00
Mark White
e72ee14006 Revert "[hwasan] remove workaround for fixed toolchain issue"
This reverts commit 07ca220182.

Reason for revert: b/293532332 - bionic unit tests failing

Change-Id: I11412df55d7131ff0bb36dee7258b75a12024100
2023-07-28 13:54:57 +00:00
Joe Onorato
b7c294a17e Add test mode for java config modules
Test: soong unit tests, verify output files are correct
Bug: 288632682
Change-Id: If5a6c916104e60e3688f5614b7420138e1a6323e
2023-07-28 05:30:25 -07:00
Aditya Kumar
a82d4dfe38 Merge "Enable CFI for riscv64" into main am: 5c2b3e2ea6 am: f2886e1913 am: 3dcc091676 am: bf18f0320e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2595746

Change-Id: If7e89deb64d17235833fd88e7fbcc2cdec0c366e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 09:47:05 +00:00
Aditya Kumar
bf18f0320e Merge "Enable CFI for riscv64" into main am: 5c2b3e2ea6 am: f2886e1913 am: 3dcc091676
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2595746

Change-Id: I51e3d4b8e69aff02f7370adb0a741208a8e15e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 08:21:53 +00:00
Aditya Kumar
3dcc091676 Merge "Enable CFI for riscv64" into main am: 5c2b3e2ea6 am: f2886e1913
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2595746

Change-Id: I99ee9f64a53b231238100f9d1a95f49138fd6178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 07:13:36 +00:00
Aditya Kumar
f2886e1913 Merge "Enable CFI for riscv64" into main am: 5c2b3e2ea6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2595746

Change-Id: I1cc89b91504b81ecd486032e65ea4345e9245bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 06:26:42 +00:00
Treehugger Robot
0bb6efe3aa Merge "Emit gtest in BUILD files only if Android.bp sets it" into main am: 6677600f35 am: 1408bd0cbb am: acefeef15a am: ee1acad996
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677917

Change-Id: I3aa178ae42b8513f03affec7dbbb9ef1e0adae03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 06:24:47 +00:00
Treehugger Robot
ee1acad996 Merge "Emit gtest in BUILD files only if Android.bp sets it" into main am: 6677600f35 am: 1408bd0cbb am: acefeef15a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677917

Change-Id: I93ab4bf6e60ba2bc9ea37d15ddf4a43ee9c1efc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 05:20:02 +00:00
Treehugger Robot
acefeef15a Merge "Emit gtest in BUILD files only if Android.bp sets it" into main am: 6677600f35 am: 1408bd0cbb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677917

Change-Id: I000ad8a3a8ab9fcae15e8d8efef16bd4f9dcb33f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 04:38:37 +00:00
Spandan Das
bd3500addf Merge changes from topic "go-test-bp2build" into main am: a11df791ed am: 609b36af4a am: f6eca2f70f am: dc877a5703
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646184

Change-Id: I5bbdcd94572842191cc1ea15cc0e269ec20c7fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 04:11:14 +00:00
Spandan Das
2d93ebba11 Add GoStdlib mnemonic for special handling of ''
This mnemonic has '' args, which would become literal empty when
combined by strings.Join. To prevent this, add it to the
special-handling function.

Bug: 284483729
Test: N/A
Change-Id: Ibd3c3ebc55284882e7336487319070b9710076d3
2023-07-28 03:07:28 +00:00
Spandan Das
dc877a5703 Merge changes from topic "go-test-bp2build" into main am: a11df791ed am: 609b36af4a am: f6eca2f70f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646184

Change-Id: If43fe59ddcbef7ed7201252babfa7f7cb7a88680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 03:05:28 +00:00
Treehugger Robot
1408bd0cbb Merge "Emit gtest in BUILD files only if Android.bp sets it" into main am: 6677600f35
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677917

Change-Id: I9858e7269c45f088986c7da78e3caeaa1e47296c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 03:04:03 +00:00
Spandan Das
f6eca2f70f Merge changes from topic "go-test-bp2build" into main am: a11df791ed am: 609b36af4a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646184

Change-Id: I52928c48446b85bff7c8145381ed17d8de197935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 01:36:09 +00:00