Commit Graph

85354 Commits

Author SHA1 Message Date
Treehugger Robot
3aca762ba7 Merge changes from topic "ctx_in_ideinfo" into main am: 9cbbafe300 am: e1028aa539
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3246818

Change-Id: Id12e0cbdeba1d100d7c755fbcf4336bc1f7c0554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 01:01:20 +00:00
Treehugger Robot
e1028aa539 Merge changes from topic "ctx_in_ideinfo" into main am: 9cbbafe300
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3246818

Change-Id: Ia2b721e9967c0772acd7dd261ec18315f6c26b5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 00:53:10 +00:00
Treehugger Robot
9cbbafe300 Merge changes from topic "ctx_in_ideinfo" into main
* changes:
  Add ctx argument to IDEInfo()
  Add configurable property support to neverallow
2024-08-28 00:49:13 +00:00
Yu Liu
ed792acd1c Merge "Remove moduleInfoJSON from ModuleBase." into main am: 713f415cde am: 4e5460e156
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3243313

Change-Id: Ice100a51c76321d4c04559bf25160f1a8ddabc2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 00:45:56 +00:00
Treehugger Robot
5956a29e5c Merge "cc: clearer OS mismatch error." into main am: 4e3486b0ba am: e23345b21f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3246717

Change-Id: Ia7fcecb929cd5e74fe58a0934621cc1b2b0c0d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 00:45:42 +00:00
Treehugger Robot
f8764f91e7 Merge "Force rebuild linker.config.pb even after a build error" into main am: abb832233f am: 72acf7fdb8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3241424

Change-Id: Id9ec582cd847e1f00e1d64fadde010526e863800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 00:45:27 +00:00
Yu Liu
4e5460e156 Merge "Remove moduleInfoJSON from ModuleBase." into main am: 713f415cde
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3243313

Change-Id: I8f89d3e41948e4b26b098c9fdb9523c5f214eb3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 00:37:24 +00:00
Treehugger Robot
e23345b21f Merge "cc: clearer OS mismatch error." into main am: 4e3486b0ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3246717

Change-Id: I9f380e8a33ad8e6e8c2164e01af1580e1c3dc83b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 00:37:16 +00:00
Treehugger Robot
72acf7fdb8 Merge "Force rebuild linker.config.pb even after a build error" into main am: abb832233f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3241424

Change-Id: I70911a495eea867409a7fbc6884f9a872acd18b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 00:37:05 +00:00
Yu Liu
713f415cde Merge "Remove moduleInfoJSON from ModuleBase." into main 2024-08-28 00:32:50 +00:00
Treehugger Robot
4e3486b0ba Merge "cc: clearer OS mismatch error." into main 2024-08-28 00:32:32 +00:00
Treehugger Robot
abb832233f Merge "Force rebuild linker.config.pb even after a build error" into main 2024-08-28 00:27:50 +00:00
Inseob Kim
e9b5e5903a Merge "Include TARGET_ODM_PROP to odm/etc/build.prop" into main am: 09557a0aa3 am: bb6ebb056b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3237749

Change-Id: I34165840e36cd0b398fc81cd773693277f809a5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 00:27:34 +00:00
Inseob Kim
bb6ebb056b Merge "Include TARGET_ODM_PROP to odm/etc/build.prop" into main am: 09557a0aa3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3237749

Change-Id: Ic2eb7fac04e50bb4dfd98cd2757e3d15a5e83090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 00:20:56 +00:00
Inseob Kim
09557a0aa3 Merge "Include TARGET_ODM_PROP to odm/etc/build.prop" into main 2024-08-28 00:15:14 +00:00
Treehugger Robot
1a3cc91ae8 Merge "Make IdeInfo into a provider" into main am: 78a3761bde am: cc02a664cf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3245754

Change-Id: I491544759b1930e46b9f7830f06f2e35a6b31042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 00:02:39 +00:00
Treehugger Robot
cc02a664cf Merge "Make IdeInfo into a provider" into main am: 78a3761bde
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3245754

Change-Id: If90b650d7e0832de74a858c541277f9658f477c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 23:55:40 +00:00
Treehugger Robot
78a3761bde Merge "Make IdeInfo into a provider" into main 2024-08-27 23:49:10 +00:00
Steven Moreland
aaae81f5fd cc: clearer OS mismatch error.
Bugs: me
Test: clear error message, for instance:

    error: frameworks/native/libs/binder/ndk/Android.bp:252:1: module "libbinder_ndk.ndk" variant "android_x86_64_silvermont_sdk_shared_29": OS mismatch between "libbinder_ndk.ndk" (android) and "libbinder_headers_platform_shared" (linux_glibc)

Change-Id: Idfa6d27daeb89056781c93a893e4080e49b3fcb0
2024-08-27 23:30:31 +00:00
Yu Liu
ca1a2fb3de Merge "Remove 6 install related fields from ModuleBase." into main am: 3e4458bf52 am: 457cf82ecc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3245217

Change-Id: I68cea3cb70cc54d88cf55f907de7498f1d921305
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 23:30:04 +00:00
Yu Liu
4297ad9046 Remove moduleInfoJSON from ModuleBase.
Bug: 358425833
Test: Manually verified all the generated ninja and mk files and CI.
Change-Id: I145272636b87b20e49c05e847336737cccc20f79
2024-08-27 23:23:26 +00:00
Yu Liu
457cf82ecc Merge "Remove 6 install related fields from ModuleBase." into main am: 3e4458bf52
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3245217

Change-Id: Iad60c890b14ced77921ca70b42fb71a102a70389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 23:21:34 +00:00
Yu Liu
3e4458bf52 Merge "Remove 6 install related fields from ModuleBase." into main 2024-08-27 23:16:21 +00:00
Cole Faust
b36d31d870 Add ctx argument to IDEInfo()
The IDEInfo() methods read properties. To make those properties
configurable, we need a context to evaluate them with.

Bug: 362579941
Test: m nothing --no-skip-soong-tests
Change-Id: I26d4b7084439b3006e50b02277298f74a929e1aa
2024-08-27 16:04:28 -07:00
Cole Faust
5b35cb9aef Add configurable property support to neverallow
Bug: 362579941
Test: m nothing --no-skip-soong-tests
Change-Id: I50b8bf3cc2e3520a12932b0a0e1041e079379590
2024-08-27 15:51:19 -07:00
Cole Faust
08c7f86575 Make IdeInfo into a provider
In order to keep the changes minimal, call the old IdeInfo method right
after GenerateAndroidBuildActions and then set the result of that
into a provider.

Test: Diff'd ninja files and saw no difference.
Change-Id: Ic706e7dbcb7c6e3d2a381ddae383eb87e105f385
2024-08-27 15:50:35 -07:00
Spandan Das
4c2221e8f0 Merge "Contents validation of override_apex's bootclasspath fragments" into main am: 39d61f53ff am: 8bd23c11bd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3241777

Change-Id: I5c0904ecd2136cde891f6f3144c679f07d711e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 20:47:57 +00:00
Spandan Das
8bd23c11bd Merge "Contents validation of override_apex's bootclasspath fragments" into main am: 39d61f53ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3241777

Change-Id: Ib59bb6607b8b35a3fe4e85815d5d2c325f9b4899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 20:41:11 +00:00
Spandan Das
39d61f53ff Merge "Contents validation of override_apex's bootclasspath fragments" into main 2024-08-27 20:32:01 +00:00
Treehugger Robot
dc9fe3495d Merge "Add a property to rust_ffi targets to exclude them from APEXes." into main am: a5762dd78b am: 8617c2d1bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3236101

Change-Id: I152db50a2663efbc644edeadc41873644eb591ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 20:31:13 +00:00
Treehugger Robot
8617c2d1bc Merge "Add a property to rust_ffi targets to exclude them from APEXes." into main am: a5762dd78b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3236101

Change-Id: Ic6a99ce2607cd20730ec6ea851f7226b5fbb3852
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 20:23:09 +00:00
Treehugger Robot
a5762dd78b Merge "Add a property to rust_ffi targets to exclude them from APEXes." into main 2024-08-27 20:13:19 +00:00
Spandan Das
8d3944aab2 Merge changes from topic "cc_prebuilt_stubs" into main am: a6f4b6b104 am: 87f001129a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3221926

Change-Id: Ic7a88d1113374f8934a570c1b8608080092c485f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 19:54:58 +00:00
Spandan Das
87f001129a Merge changes from topic "cc_prebuilt_stubs" into main am: a6f4b6b104
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3221926

Change-Id: I7b1d51ff8b301f9f3b7cf7ae9c4a14fb403a6a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 19:46:17 +00:00
Spandan Das
a6f4b6b104 Merge changes from topic "cc_prebuilt_stubs" into main
* changes:
  Skip `-Wl,--version-script` on libclang_rt.* stubs (temp hack)
  Special case the stubgen args for bionic libs
  Add stub generation support to cc_prebuilt_library
2024-08-27 19:37:08 +00:00
Yu Liu
82a6d1464d Remove 6 install related fields from ModuleBase.
Bug: 358425833
Test: Manually verified all the generated ninja and mk files and CI.
Change-Id: If2c3417781953a1eef2b07a241424157fd73abff
2024-08-27 19:03:35 +00:00
Spandan Das
ed7a030c6c Contents validation of override_apex's bootclasspath fragments
https://r.android.com/3083813 added support for overriding
min_sdk_version, and creating separate variants of transitive
dependencies of override apexes. This causes issues when there is a skew
between apex boot jars of source and prebuilt mainline modules. For
mediaprovider google apex, we now have _two_ source variants of
mediaprovider bcp fragment module.

This CL uses ApexInfo.BaseApexName to skip the check on both variants of
bootclasspath/systemserverclasspath fragments.

This CL also removes the prefix based check to determine if prebuilts
are active. If RELEASE_APEX_CONTRIBUTIONS for a specific mainline module
is set, it will be assumed that prebuilts for that mainline module are
active.

Test: go test ./apex ./java
Bug: 361771739

Change-Id: I01f7ef437df8f10b74ffa397ba461ff4f1f9bed6
2024-08-27 18:48:46 +00:00
Chris Wailes
efb31461f3 Merge "rustc-1.80.1 Build 12274397" into main am: bbcbe86fe3 am: 4c4f23ffea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3240757

Change-Id: I6082a3149afbeae4ed8cf8220797d8558ead5d42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 18:16:15 +00:00
Chris Wailes
4c4f23ffea Merge "rustc-1.80.1 Build 12274397" into main am: bbcbe86fe3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3240757

Change-Id: I3425d51b22a27a714c9f2442e73b713cca859b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 18:08:06 +00:00
Chris Wailes
bbcbe86fe3 Merge "rustc-1.80.1 Build 12274397" into main 2024-08-27 18:00:26 +00:00
Ashutosh Agarwal
46e4fad202 Add a property to rust_ffi targets to exclude them from APEXes.
This is a temporary measure until stubs are properly supported by rust_ffi targets.

Bug: 361441210
Bug: 362509506
Change-Id: Ieabd4e3abf442de660f39ec6c5776f5832b25e14
Test: manual
2024-08-27 17:13:12 +00:00
Yu Liu
8af91a861e Merge "Remove licenseMetadataFile and installFiles from ModuleBase." into main am: 4b98396c64 am: f8b8dcfbea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3242292

Change-Id: I2b01d7201127e248d20a1af6a5ff2ea07f5bcfd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 16:06:21 +00:00
Yu Liu
f8b8dcfbea Merge "Remove licenseMetadataFile and installFiles from ModuleBase." into main am: 4b98396c64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3242292

Change-Id: I1b4551603b70e2faad9dd886b638cc6eb775f03b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 15:57:40 +00:00
Yu Liu
4b98396c64 Merge "Remove licenseMetadataFile and installFiles from ModuleBase." into main 2024-08-27 15:54:00 +00:00
Pindar Yang
58b069ee5e Merge "Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for soong"" into main am: 1282d27291 am: 33d6f763e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3235655

Change-Id: I1426da1125f277fc9551398f940a4a35360cfe09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 03:41:31 +00:00
Pindar Yang
33d6f763e2 Merge "Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for soong"" into main am: 1282d27291
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3235655

Change-Id: Idac5d2bbdecd6af39d5983b91bd60a7134e81c9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 03:33:33 +00:00
Pindar Yang
1282d27291 Merge "Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for soong"" into main 2024-08-27 03:25:23 +00:00
Pindar Yang
1558cc68ec Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for soong"
Revert submission 3195743-compatibility_matrix

Reason for revert: Build Break, Bug: 361227456

Reverted changes: /q/submissionid:3195743-compatibility_matrix

Change-Id: Ib89cdc64eb816ca0df872473b1e9a9dfdb08ceee
2024-08-27 03:22:41 +00:00
Justin Yun
87f543d889 Force rebuild linker.config.pb even after a build error
After a build failure of linker.config.pb, we must manually remove
the temp.pb file to resume the build again after fixing the error.
By adding '--force' flag, the script will overwrite the existing
temp.pb file.

Bug: na
Test: build after an error for linker.config.pb
Change-Id: If51ba8291de49a7c0bed8771d702f61c904d3455
2024-08-27 10:30:27 +09:00
Jihoon Kang
c8270d4ec9 Add the list of currently existing violations am: 17a362a506 am: 3b7db8f619
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3166179

Change-Id: I4bab63785b89bbcb4745a34f2e63ea1c32d6c3b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 01:11:35 +00:00