Commit Graph

78501 Commits

Author SHA1 Message Date
Anton Hansson
05eabd9c4d Merge "Created empty framework-location non-updatable module" into main 2023-10-24 12:43:36 +00:00
Sebastian Pickl
479ab86e6b Merge "Revert "Default from-text stub generation in build"" into main 2023-10-24 12:43:24 +00:00
Sebastian Pickl
1c4188c9da Revert "Default from-text stub generation in build"
This reverts commit 182b56b870.

Reason for revert: prime suspect for breaking boot tests b/307495247, b/307411752

Bug:307495247
Change-Id: Iea05703b767d2699ca3cf69377eb44b1d21697ad
2023-10-24 11:20:06 +00:00
Anton Hansson
a38341a2d2 [automerger skipped] Merge "SdkTestCore for non-updatable modules" into main am: af1c929943 am: 2d7bb94e31 -s ours am: a31c95abf3 -s ours
am skip reason: Merged-In Iba3213e8c34ea75ac9dd8532a95ef62fb5455e6c with SHA-1 9421c4ceb9 is already in history

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

Change-Id: I32bd74fa05cc98e4634fc0a7a07bca1ee7eaba68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 11:18:45 +00:00
Anton Hansson
5dced1ec90 [automerger skipped] Merge "SdkTestCore for non-updatable modules" into main am: af1c929943 am: 8270d67ad9 am: b0295da906 -s ours
am skip reason: Merged-In Iba3213e8c34ea75ac9dd8532a95ef62fb5455e6c with SHA-1 beb6e9ffdb is already in history

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

Change-Id: I0646b7480ad5d08d7a37d3d0e73ca1d67f54fe10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 11:17:45 +00:00
Anton Hansson
a31c95abf3 [automerger skipped] Merge "SdkTestCore for non-updatable modules" into main am: af1c929943 am: 2d7bb94e31 -s ours
am skip reason: Merged-In Iba3213e8c34ea75ac9dd8532a95ef62fb5455e6c with SHA-1 9421c4ceb9 is already in history

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

Change-Id: I45cba772a2d6673d716f3203c2a79c6e898d5c90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 10:49:56 +00:00
Anton Hansson
b0295da906 Merge "SdkTestCore for non-updatable modules" into main am: af1c929943 am: 8270d67ad9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2799773

Change-Id: I7357fb62579dc8cfa92d50cc71392a1e32d9344d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 10:48:17 +00:00
Anton Hansson
2d7bb94e31 Merge "SdkTestCore for non-updatable modules" into main am: af1c929943
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2799773

Change-Id: I181d4003899884ea326b10e1dfe0f4f5feb4c593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 10:30:14 +00:00
Anton Hansson
8270d67ad9 Merge "SdkTestCore for non-updatable modules" into main am: af1c929943
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2799773

Change-Id: Ib97c590701670ec8269942541285404f23aea4e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 10:28:33 +00:00
Anton Hansson
af1c929943 Merge "SdkTestCore for non-updatable modules" into main 2023-10-24 10:06:54 +00:00
Yu Liu
bf12901a7e Merge "Support a few more attrs in cc_aconfig_library." into main am: 7ec40649bb am: c33c0dec83 am: e11359ad49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2797727

Change-Id: Iaa76fe963c49a8b2d65283ff6a550145725e8445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 23:54:06 +00:00
Yu Liu
b093fa396d Merge "Support a few more attrs in cc_aconfig_library." into main am: 7ec40649bb am: 914e5b51d7 am: c8419ecf33
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2797727

Change-Id: I043a6a95b703f13254b7603319bf6c479a779c46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 23:53:34 +00:00
Yu Liu
e11359ad49 Merge "Support a few more attrs in cc_aconfig_library." into main am: 7ec40649bb am: c33c0dec83
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2797727

Change-Id: I1671efec09051a76b1e6a9cdfe556da64049600b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 23:26:21 +00:00
Yu Liu
c8419ecf33 Merge "Support a few more attrs in cc_aconfig_library." into main am: 7ec40649bb am: 914e5b51d7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2797727

Change-Id: Icc60800643bd0a2fbc30bf86742908cabb134f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 23:25:30 +00:00
Yu Liu
c33c0dec83 Merge "Support a few more attrs in cc_aconfig_library." into main am: 7ec40649bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2797727

Change-Id: Id4e3a1ab3a1948a23cf2b6f6df17f7f26e63e3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 23:06:59 +00:00
Yu Liu
914e5b51d7 Merge "Support a few more attrs in cc_aconfig_library." into main am: 7ec40649bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2797727

Change-Id: Ia05e3d17ecc899dae099ff9b7b2a242063cc339b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 23:05:17 +00:00
Yu Liu
7ec40649bb Merge "Support a few more attrs in cc_aconfig_library." into main 2023-10-23 22:47:37 +00:00
Jihoon Kang
403518a5c7 Merge "Default from-text stub generation in build" into main am: 82f0f7eca1 am: 3b2278bba4 am: 7b0bc6cb60
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617457

Change-Id: I9801ef6601136e31dd3ddd0f98d618dad543c2d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 22:44:03 +00:00
Jihoon Kang
58c55df235 Merge "Default from-text stub generation in build" into main am: 82f0f7eca1 am: 7e27c69da1 am: 3efc4ce811
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617457

Change-Id: I3c1245e95bb785dcd118023632d48eeb202600a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 22:42:51 +00:00
Jihoon Kang
7b0bc6cb60 Merge "Default from-text stub generation in build" into main am: 82f0f7eca1 am: 3b2278bba4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617457

Change-Id: I5b9887d68e3e09d91a323157b162b41789b4089f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 22:14:40 +00:00
Jihoon Kang
3efc4ce811 Merge "Default from-text stub generation in build" into main am: 82f0f7eca1 am: 7e27c69da1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617457

Change-Id: Idd22222dd508823b40af9634d1e8fb16346a996c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 22:13:33 +00:00
Jihoon Kang
3b2278bba4 Merge "Default from-text stub generation in build" into main am: 82f0f7eca1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617457

Change-Id: I03f97e3ff77f17baaccdda753a5630052037171d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 21:54:58 +00:00
Automerger Merge Worker
aa8a578d3e Merge "Handle Android.bp files in subdirectories of androidx am: ec26327735 am: f80899cd23" into udc-qpr-dev-plus-aosp am: 417c474e59
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2800134

Change-Id: Idb72aadd5cc886b7ea85a77218a6222e370aa723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 21:53:49 +00:00
Jihoon Kang
7e27c69da1 Merge "Default from-text stub generation in build" into main am: 82f0f7eca1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2617457

Change-Id: I8086c19c8d8e1382652920bb238e6e22d61ee457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 21:53:36 +00:00
Alan Viverette
248ae6cfd7 Handle Android.bp files in subdirectories of androidx am: ec26327735 am: 97633e43da am: 5a39617a5d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2800134

Change-Id: Ie5b2863cd487973d56b3894bf70a0c32acb3b825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 21:53:20 +00:00
Jihoon Kang
82f0f7eca1 Merge "Default from-text stub generation in build" into main 2023-10-23 21:42:50 +00:00
Automerger Merge Worker
417c474e59 Merge "Handle Android.bp files in subdirectories of androidx am: ec26327735 am: f80899cd23" into udc-qpr-dev-plus-aosp 2023-10-23 21:26:45 +00:00
Alan Viverette
e86e76a73a Handle Android.bp files in subdirectories of androidx am: ec26327735 am: f80899cd23
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2800134

Change-Id: I38ce5f18c6b709a3b15aadbf43fd7350a98c51c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 21:26:37 +00:00
Alan Viverette
5a39617a5d Handle Android.bp files in subdirectories of androidx am: ec26327735 am: 97633e43da
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2800134

Change-Id: Iddf81b93ab0dae471429626617d09a79317e0f1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 21:26:32 +00:00
Alan Viverette
f80899cd23 Handle Android.bp files in subdirectories of androidx am: ec26327735
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2800134

Change-Id: I746f4369e68226b86ca8d2bcb13149ef01371422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 21:07:55 +00:00
Alan Viverette
97633e43da Handle Android.bp files in subdirectories of androidx am: ec26327735
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2800134

Change-Id: I466fc52ff56ce2bab213cada9efbeb265a45802d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 21:07:07 +00:00
Alan Viverette
ec26327735 Handle Android.bp files in subdirectories of androidx
Bug: 304263344
Test: m droid
Change-Id: I473d017ed3169137cc234f7fbd5f01d5ad889cb2
2023-10-23 13:25:13 -04:00
Mark White
9421c4ceb9 SdkTestCore for non-updatable modules
Provides SdkTestCore/test_core_current sdk_version for non-updatable
modules that have their test scope dependent on test apis from
framework-minus-apex.

Ignore-AOSP-First: Change in topic with internal-first projects
Bug: 289776578
Test: m checkapi | go test ./java

Merged-In: Iba3213e8c34ea75ac9dd8532a95ef62fb5455e6c
Change-Id: Iba3213e8c34ea75ac9dd8532a95ef62fb5455e6c
2023-10-23 15:25:55 +00:00
Treehugger Robot
21ec84662d Merge "Globally disable -Wreorder-init-list." into main am: c70be4b986 am: 8793576748 am: 420cf7e902
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794922

Change-Id: I4bbc472d53c049e033f47014c31a3a58ebeafa6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-22 10:49:24 +00:00
Treehugger Robot
c798fcf1d6 Merge "Globally disable -Wreorder-init-list." into main am: c70be4b986 am: dc7e1146da am: a1ee650c2e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794922

Change-Id: Ibc0e9037edd4fe33c8077b6c4d7789e09c03ab56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-22 10:49:07 +00:00
Treehugger Robot
420cf7e902 Merge "Globally disable -Wreorder-init-list." into main am: c70be4b986 am: 8793576748
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794922

Change-Id: I4d9e0b3701216bab5b518749669c48470c27d99a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-22 10:24:12 +00:00
Treehugger Robot
a1ee650c2e Merge "Globally disable -Wreorder-init-list." into main am: c70be4b986 am: dc7e1146da
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794922

Change-Id: Ib8611b55d73e290c92a0903647ce57839be7defe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-22 10:23:13 +00:00
Treehugger Robot
8793576748 Merge "Globally disable -Wreorder-init-list." into main am: c70be4b986
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794922

Change-Id: Idd07ec4dff8691e490d3d5f850c35a2efe18589e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-22 10:07:50 +00:00
Treehugger Robot
dc7e1146da Merge "Globally disable -Wreorder-init-list." into main am: c70be4b986
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2794922

Change-Id: Ief7d4fd6b2c899232998d1ca514a88f0d50054c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-22 10:06:14 +00:00
Treehugger Robot
c70be4b986 Merge "Globally disable -Wreorder-init-list." into main 2023-10-22 09:49:55 +00:00
Krzysztof Kosiński
8f8cc1668e Globally disable -Wreorder-init-list.
This warning is triggered even when initializers don't have any
side effects, so it very rarely surfaces actual bugs/mistakes.
99% of the time it complains about a purely cosmetic issue.
Disable it by default in commonGlobalCFlags, which still allows
individual modules to opt into it.

Bug: 145210666
Test: presubmit
Change-Id: I671b5c457ee3d92b9cc37f020ba54e01e1a04f59
2023-10-22 05:09:40 +00:00
Jihoon Kang
c5c487fe91 Merge "Modify the product variable Build_from_text_stub value" into main am: e8f21ac529 am: 51dec9e919 am: 45ea70c318
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2797656

Change-Id: I8d76f76bb4a1da0f4553d7078349a3b1d7f1fea2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-21 02:41:24 +00:00
Jihoon Kang
4275458352 Merge "Modify the product variable Build_from_text_stub value" into main am: e8f21ac529 am: 6f2a1fe31e am: 1ee4f84795
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2797656

Change-Id: Ieb94c90c7fe3944a9bc7c24a1f20f7cb9c5f7059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-21 02:40:28 +00:00
Jihoon Kang
45ea70c318 Merge "Modify the product variable Build_from_text_stub value" into main am: e8f21ac529 am: 51dec9e919
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2797656

Change-Id: I6a1071a11a90798f4a69c2315f4571888809b0da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-21 02:16:25 +00:00
Jihoon Kang
1ee4f84795 Merge "Modify the product variable Build_from_text_stub value" into main am: e8f21ac529 am: 6f2a1fe31e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2797656

Change-Id: Ie38652f0d666bdec1459cf6e5c159078c7442186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-21 02:15:15 +00:00
Jihoon Kang
51dec9e919 Merge "Modify the product variable Build_from_text_stub value" into main am: e8f21ac529
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2797656

Change-Id: I27137d763d82a47538d479bae87588f465a57d17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-21 01:59:29 +00:00
Jihoon Kang
6f2a1fe31e Merge "Modify the product variable Build_from_text_stub value" into main am: e8f21ac529
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2797656

Change-Id: I255fde9c8e0ce8b81d270234537e2320e79c3903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-21 01:57:40 +00:00
Jihoon Kang
e8f21ac529 Merge "Modify the product variable Build_from_text_stub value" into main 2023-10-21 01:45:07 +00:00
Cole Faust
9cc08060ee Merge "Load a list of plugins from vendor/google_clockwork" into main am: c9ef6f71cf am: 57e7d2f406 am: 5d47fa27f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2798384

Change-Id: I5b10ade3f0c84c3c864220561331ff3716c4bd79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 23:11:44 +00:00
Jihoon Kang
182b56b870 Default from-text stub generation in build
This change defaults Java stubs to be generated from API text files
during build. Using the `--build-from-source-stubs` flag, users can
toggle between the feature.

Test: m nothing && verify ninja path exists between android_stubs_current and android_stubs_current.from-text, and does not exist between android_stubs_current.from-source, m nothing --build-from-source-stub && verify the opposite
Bug: 274805756
Change-Id: I28834f92c1b1311e3fe0a71a6ea9e8ec2e278d7e
2023-10-20 23:11:19 +00:00