Commit Graph

64835 Commits

Author SHA1 Message Date
Treehugger Robot
15373a714b Merge changes I0ab8459b,I2ef90f4d am: 28ba80665d am: 170e0c87a5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2521436

Change-Id: I4158cce8da46c785e1ec3310bd0a559c15f07924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 18:48:38 +00:00
Treehugger Robot
170e0c87a5 Merge changes I0ab8459b,I2ef90f4d am: 28ba80665d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2521436

Change-Id: Ifacd2008515ffbf9b77126a5646f2d6723608ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 18:22:09 +00:00
Treehugger Robot
28ba80665d Merge changes I0ab8459b,I2ef90f4d
* changes:
  Create core-lambda-stubs from .txt files
  Fix the suffix used in names of java_system_modules
2023-04-04 17:54:56 +00:00
Victor Chang
6f43448019 Merge "Add com.android.tools.r8.emitRecordAnnotationsExInDex flag" am: 32952b975d am: 7e1f02b9b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2495879

Change-Id: I7f2728212045bab5b222f049943e9a855ea61976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 11:42:04 +00:00
Victor Chang
7e1f02b9b9 Merge "Add com.android.tools.r8.emitRecordAnnotationsExInDex flag" am: 32952b975d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2495879

Change-Id: Idb2c1f2e156a98afce6eb217bbc7debde8a86429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 11:13:53 +00:00
Victor Chang
32952b975d Merge "Add com.android.tools.r8.emitRecordAnnotationsExInDex flag" 2023-04-04 11:12:05 +00:00
Jingwen Chen
125e38770e Merge "Revert "Allowlist more of system/timezone"" am: 37eec7d019 am: 408567ae8a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2519917

Change-Id: I2e09a67653082be5f5630dbc7c0a17dc3d7b5c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 04:55:20 +00:00
Cole Faust
873f3fe9ab Merge "Keep existing build files in build/make/target/product/security" am: 5bc31c11ba am: 3b759a9be7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2518655

Change-Id: Ibb7f0be9c476ab9f9beb237826939077ecb7cfb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 04:55:04 +00:00
Jingwen Chen
408567ae8a Merge "Revert "Allowlist more of system/timezone"" am: 37eec7d019
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2519917

Change-Id: I46526ddb847a2db5f07a5a88106fc41340bff0e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 04:27:20 +00:00
Cole Faust
3b759a9be7 Merge "Keep existing build files in build/make/target/product/security" am: 5bc31c11ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2518655

Change-Id: I6d9ba1ab044a11f68214687570dd9a6285354894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 04:27:00 +00:00
Jingwen Chen
37eec7d019 Merge "Revert "Allowlist more of system/timezone"" 2023-04-04 04:09:26 +00:00
Cole Faust
5bc31c11ba Merge "Keep existing build files in build/make/target/product/security" 2023-04-04 03:58:15 +00:00
Treehugger Robot
71298d6cdc Merge "Make outputApexFile relative to module dir in mixed builds" am: f590058fd2 am: 7095c2a2fc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2520724

Change-Id: Ia79b125c88f64c2faad524b494f429b75aae8a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 02:26:21 +00:00
Treehugger Robot
7095c2a2fc Merge "Make outputApexFile relative to module dir in mixed builds" am: f590058fd2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2520724

Change-Id: I74302811b29d222162948f7905af7eb9db34af28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 02:12:44 +00:00
Wei Li
7b572cef71 Merge "Update the SBOM integration test to include ramdisk partition and resolve some diffs." am: 0766f4c66c am: f10876f515
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513818

Change-Id: I8b312d78cc8e7dd7c06424ec0c75540f1f9b2f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 01:55:25 +00:00
Treehugger Robot
f590058fd2 Merge "Make outputApexFile relative to module dir in mixed builds" 2023-04-04 01:35:10 +00:00
Wei Li
f10876f515 Merge "Update the SBOM integration test to include ramdisk partition and resolve some diffs." am: 0766f4c66c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513818

Change-Id: I82b431bd7c6f8d4b22e59352c833df972e5d88de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 01:26:39 +00:00
Wei Li
0766f4c66c Merge "Update the SBOM integration test to include ramdisk partition and resolve some diffs." 2023-04-04 00:55:38 +00:00
Jihoon Kang
22bd36e459 Merge "Add dep_api_srcs property to java_api_library module" am: 91a86d4112 am: 6f8a62b72a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2485976

Change-Id: Ia5b308ba2e6462f9c00ce1331f1cad28bc9e07b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 00:26:04 +00:00
Jiyong Park
ebbb91a105 Merge "Assert that platform_sdk_codename is set" am: 7a64621169 am: 04657453e7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2505641

Change-Id: I40d0e33b7dba5106348fb5a6ba7fa4033803d653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 00:25:44 +00:00
Jihoon Kang
6f8a62b72a Merge "Add dep_api_srcs property to java_api_library module" am: 91a86d4112
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2485976

Change-Id: I18a81f505a5d1e3ea81627d3b3dee3ef18da0aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 23:56:11 +00:00
Jiyong Park
04657453e7 Merge "Assert that platform_sdk_codename is set" am: 7a64621169
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2505641

Change-Id: I512e9b14b265ab11199fb016dfc01dc57c402b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 23:54:58 +00:00
Jihoon Kang
91a86d4112 Merge "Add dep_api_srcs property to java_api_library module" 2023-04-03 23:42:19 +00:00
Spandan Das
760f880495 Create core-lambda-stubs from .txt files
APIs to compile lambda are part of art's toolchain api surface.
Generating stubs from .txt files allows us to prune the remaining sdk
dependencies on libcore/ that are not api files

Test: m core-lambda-stubs.from-text
(On top of change containing core.current.stubs.from-text
and turning enabled: true)

Change-Id: I0ab8459b9317cb055a434eb635ba06d38da5b92e
2023-04-03 23:42:08 +00:00
Treehugger Robot
aa8518fad3 [automerger skipped] Merge changes from topic "fdo_profile" am: 43a2a9a5c6 am: e85290a035 -s ours
am skip reason: Merged-In Ia14679285b92f3f14ff269392a61f978c71311b2 with SHA-1 611f036669 is already in history

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

Change-Id: Ic2375d2731b5d825867ecd1ac6e688ce4307d523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 23:38:36 +00:00
Vinh Tran
ceefbc19f2 [automerger skipped] Implement fdo_profile module type am: 44cb78c988 am: 23f946553a -s ours
am skip reason: Merged-In I687d798a02d9743c92804fea36fb4ae3a7a0e5e3 with SHA-1 0ccc232691 is already in history

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

Change-Id: I37796f24b8da56d26add87c7a1a4286cf95a59a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 23:38:31 +00:00
Spandan Das
0cb803a5d6 Fix the suffix used in names of java_system_modules
Test: N/A (enabled flag is still off)
Change-Id: I2ef90f4d9099bf183d65dcf8ebdf532d5fa445b6
2023-04-03 23:29:57 +00:00
Jiyong Park
7a64621169 Merge "Assert that platform_sdk_codename is set" 2023-04-03 23:28:58 +00:00
Jingwen Chen
83a4b68ff4 Revert "Allowlist more of system/timezone"
This reverts commit da03b08062.

Reason for revert: This was previously reverted in aosp/2510617 due to b/275666961, which spawned b/276416537 and b/276416485 that Cole and I are working on now. Given that the root causes are still being actively resolved, I believe this will cause the test (b/275666961) to fail again.

Change-Id: I69e756f823f920610a832a1fc88b415074c0f488
2023-04-03 23:22:54 +00:00
Treehugger Robot
e85290a035 Merge changes from topic "fdo_profile" am: 43a2a9a5c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517917

Change-Id: I6b80173900757238510d864344d3dec8a6ecf2e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 23:11:14 +00:00
Vinh Tran
23f946553a Implement fdo_profile module type am: 44cb78c988
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517916

Change-Id: Iba1313ac84b7fc0f07debc8eda9414b221ce0e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 23:11:06 +00:00
Treehugger Robot
43a2a9a5c6 Merge changes from topic "fdo_profile"
* changes:
  Reimplement afdo support for rust
  Implement fdo_profile module type
2023-04-03 22:35:25 +00:00
Treehugger Robot
3bf2755434 Merge "Set OUT_DIR=out with no src_deps." am: d61ea3580d am: 3295e672e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2518975

Change-Id: I4116612ed839ee66098f02ab1b65de0fb4c794dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 21:34:11 +00:00
Liz Kammer
a838260a9d Merge "Allowlist more of system/timezone" am: 5342482043 am: 17ea43ba7f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2511255

Change-Id: I1eb1a501817c26fe4fe8cfedc0d59f84c80f1096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 21:29:11 +00:00
Cole Faust
b0bfa07919 Make outputApexFile relative to module dir in mixed builds
Otherwise when other modules use the apex as data (for example, in
tests) they get the full path from the root of the workspace to the
apex.

Fixes: 276416485
Test: atest timezone_data_e2e_tests:com.android.tests.apex.TimezoneDataHostTest#testStageActivateUninstallApexPackage -- --abi x86_64 then tree out/host/linux-x86/testcases/timezone_data_e2e_tests
Change-Id: Id740856794770df2edc55dfff5f6f938fc31d0c5
2023-04-03 14:28:36 -07:00
Treehugger Robot
3295e672e2 Merge "Set OUT_DIR=out with no src_deps." am: d61ea3580d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2518975

Change-Id: Iec20dffdd5b00d2f6d1d2aebca78bce45601f495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 21:03:23 +00:00
Liz Kammer
17ea43ba7f Merge "Allowlist more of system/timezone" am: 5342482043
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2511255

Change-Id: I6e2c317b54f3455c6da31c3c5236701bd2dbf5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 21:01:10 +00:00
Treehugger Robot
d61ea3580d Merge "Set OUT_DIR=out with no src_deps." 2023-04-03 19:01:58 +00:00
Jihoon Kang
01e522cac5 Add dep_api_srcs property to java_api_library module
Users can pass the jar-file creating module via dep_api_srcs property in
java_api_library to create the jar file not by compiling the stubs
generated from metalava but by extracting and zipping the class files
from the jar file of the input module.

Test: m android-non-updatable.stubs.from-text
Bug: 273381329
Change-Id: Id1b75179111cc7ff45faaff58388db1347bb18e5
2023-04-03 17:53:40 +00:00
Liz Kammer
5342482043 Merge "Allowlist more of system/timezone" 2023-04-03 17:43:17 +00:00
Treehugger Robot
7190c6776a Merge changes Ib9ff4eb5,If27a050c am: 71585a0187 am: 2448d10b58
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516456

Change-Id: If8f27ecc9eb82fa16b54f038ef248f9e35a5863f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 17:38:45 +00:00
Spandan Das
83f7ac9d8d Merge "Rename core stubs to .txt stubs if applicable" am: 77e3278c50 am: ac7b7d2a89
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2514796

Change-Id: I40690db4a0672546c4ec3918c3932d8b5364f75e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 17:38:31 +00:00
Treehugger Robot
2448d10b58 Merge changes Ib9ff4eb5,If27a050c am: 71585a0187
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516456

Change-Id: Ieeba53d45323bde3a481ad7b73127472872828aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 17:11:08 +00:00
Spandan Das
ac7b7d2a89 Merge "Rename core stubs to .txt stubs if applicable" am: 77e3278c50
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2514796

Change-Id: Ia51784b2371933e8531d3f6e02e0d6a27a7bda21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 17:10:07 +00:00
Treehugger Robot
71585a0187 Merge changes Ib9ff4eb5,If27a050c
* changes:
  add *.from-text modules to the java test fixture
  Create a SetBuildFromTextStub method
2023-04-03 16:44:08 +00:00
Spandan Das
77e3278c50 Merge "Rename core stubs to .txt stubs if applicable" 2023-04-03 16:37:53 +00:00
Alix Espino
46214cca30 Merge "Simplify logic in Soong ApiLevelFromUserWithConfig" am: 2173e6545a am: 0e5c5598aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2509779

Change-Id: Ib404917275df195b9aa6fbdea8cfef386b880b22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 14:38:24 +00:00
Alix Espino
0e5c5598aa Merge "Simplify logic in Soong ApiLevelFromUserWithConfig" am: 2173e6545a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2509779

Change-Id: Ia66beba64d45559d643e3e0d95a41b90096a8321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 14:08:25 +00:00
Alix Espino
2173e6545a Merge "Simplify logic in Soong ApiLevelFromUserWithConfig" 2023-04-03 13:41:02 +00:00
Treehugger Robot
da56dee349 Merge "Remove stub-annotations from art stubs system modules" am: 1c102d34b7 am: 5485148807
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2515531

Change-Id: I3ab8e00e2f2db7021648ed07bc9d1f72dfc8e1a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 11:52:23 +00:00