StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,732 Commits 1 Branch 0 Tags
3379d4e3d808c854e66532b9fe38fda23b47227c
Commit Graph

81732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Saccone
3379d4e3d8 Merge "Revert "Switch to JDK 21"" into main am: bfa20d7e15 am: e93ae387e8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2994633

Change-Id: Ibe79e815e6002c57e49794b2ebadd858dc5ccc57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-11 18:59:35 +00:00
Sam Saccone
e93ae387e8 Merge "Revert "Switch to JDK 21"" into main am: bfa20d7e15 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2994633

Change-Id: Idfe1a6bbfb3d1f02b51eef233d9807463d20f8a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-11 18:16:35 +00:00
Sam Saccone
bfa20d7e15 Merge "Revert "Switch to JDK 21"" into main 2024-03-11 17:05:56 +00:00
Treehugger Robot
182a9a6e24 Merge "Allow PrevVendorApiLevel to be less than 34" into main am: b952c84841 am: 36741000cb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2988349

Change-Id: I191fdfce4c546bef900d642f25ebe5cc72802866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-11 06:25:54 +00:00
Treehugger Robot
36741000cb Merge "Allow PrevVendorApiLevel to be less than 34" into main am: b952c84841 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2988349

Change-Id: I91a1971b37054084f0b6ea333ea2a839d8461d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-11 05:44:42 +00:00
Treehugger Robot
b952c84841 Merge "Allow PrevVendorApiLevel to be less than 34" into main 2024-03-11 04:56:59 +00:00
Cole Faust
ac77e234bf Remove unused code in update.go am: 8c36631fa0 am: e91b089b84 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2995682

Change-Id: I573f6ed7f9df6f28c35f7f124b8a1348d681106f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-09 00:39:23 +00:00
Cole Faust
e91b089b84 Remove unused code in update.go am: 8c36631fa0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2995682

Change-Id: I84d398db485ecc4db75dbb2e6b22374eceae9cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-08 23:57:07 +00:00
Cole Faust
da4b204470 Merge "Replace generatedFile with android.WriteFileRule" into main am: f3fcc952f2 am: d7be39b346 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2994765

Change-Id: Ica925787ee1cb2c9502b63c358491859c8fc4e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-08 19:41:02 +00:00
Treehugger Robot
444e613512 Merge "Remove starlark_import" into main am: 385138a836 am: eef7c5c2f2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2994758

Change-Id: I4f090e91c95a94c257943b9a9f4a6acb8584db19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-08 19:40:42 +00:00
Treehugger Robot
3e590e6959 Merge "Optimize buildPropFile()" into main am: 181a27986c am: 6a234dc0c1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2994764

Change-Id: Ie25f78bc86de732f41722bee2c5f258b8665d598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-08 19:39:00 +00:00
Jihoon Kang
99b9a78382 Merge "Fix missing credential error message" into main am: 48872f5443 am: 6220f3fdd7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2995616

Change-Id: I0aab44b7dc722f8c617c0e00e8976492aaacc9fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-08 19:38:06 +00:00
Treehugger Robot
b08153e781 Merge "Switch to JDK 21" into main am: 092c3a56fb am: f30930f404 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2920125

Change-Id: I5e89bce53c531700ad958fb583b2594e4d9168f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-08 19:36:23 +00:00
Zi Wang
9df8ce28db [automerger skipped] Merge "Add property Skip_jarjar_repackage" into main am: 5ae58dcabe am: ddeca6128e -s ours 
am skip reason: Merged-In I9384c9c25ce581ac00d309a188cf7533eb2e44a6 with SHA-1 9bdd4228cb is already in history

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

Change-Id: I2ae87e3bbfd2414845c757b54e48da1d6bffb540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-08 19:31:11 +00:00
Cole Faust
d7be39b346 Merge "Replace generatedFile with android.WriteFileRule" into main am: f3fcc952f2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2994765

Change-Id: Ie6714f60f530654f0a9237ad418f43918adb315d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-08 19:03:45 +00:00
Treehugger Robot
eef7c5c2f2 Merge "Remove starlark_import" into main am: 385138a836 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2994758

Change-Id: Idced32ec5178dc6df3bb4da31c90125a9921e7ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-08 19:03:05 +00:00
Treehugger Robot
6a234dc0c1 Merge "Optimize buildPropFile()" into main am: 181a27986c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2994764

Change-Id: Ifaaa56ce1cce0577edd19b2fd11d72751ae7e8f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-08 19:02:15 +00:00
Jihoon Kang
6220f3fdd7 Merge "Fix missing credential error message" into main am: 48872f5443 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2995616

Change-Id: I9246feab874c958c82064454e3cb43d79908be40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-08 19:00:13 +00:00
Cole Faust
8c36631fa0 Remove unused code in update.go 
Test: m nothing
Change-Id: Idae97a203bfcf451456766c0b6eb5430959c0ade
 2024-03-08 10:58:32 -08:00
Treehugger Robot
f30930f404 Merge "Switch to JDK 21" into main am: 092c3a56fb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2920125

Change-Id: Ic0a9c6fc910d992a58ccd3b3abfb5804cc41f2a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-08 18:56:17 +00:00
Cole Faust
f3fcc952f2 Merge "Replace generatedFile with android.WriteFileRule" into main 2024-03-08 18:49:59 +00:00
Zi Wang
ddeca6128e Merge "Add property Skip_jarjar_repackage" into main am: 5ae58dcabe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2990064

Change-Id: I13b797f2505b772a602fa467808d9ce51afb7888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-08 18:47:49 +00:00
Treehugger Robot
385138a836 Merge "Remove starlark_import" into main 2024-03-08 18:32:09 +00:00
Treehugger Robot
181a27986c Merge "Optimize buildPropFile()" into main 2024-03-08 10:24:50 +00:00
Jihoon Kang
48872f5443 Merge "Fix missing credential error message" into main 2024-03-08 06:34:50 +00:00
Cole Faust
ed158f4d1c Replace generatedFile with android.WriteFileRule 
Fewer lines of code and more performant.

Test: Presubmits
Change-Id: If09dae6aba67c19106d4cbf058a60bbbc27f78d2
 2024-03-07 16:41:27 -08:00
Jihoon Kang
70de2c04a7 Fix missing credential error message 
LOAS credential enforcement is already taking effect, not in the future.
Update the warning message accordingly.

Test: gcertdestroy && m and inspect error message
Bug: 318506452
Change-Id: I857f44b265c454beaffb9e662bd318aeb29f6cdb
 2024-03-08 00:11:20 +00:00
Cole Faust
cec230a0eb Optimize buildPropFile() 
Use android.WriteFileRuleVerbatim instead of a custom RuleBuilder
with echo commands.

Test: m nothing --no-skip-soong-tests
Change-Id: I9734305cbb404fd2ae841af2525f0db235622315
 2024-03-07 15:51:12 -08:00
Sorin Basca
b832ae19d8 Revert "Switch to JDK 21" 
This reverts commit 5a2e36b755.

Reason for revert: Preparing revert to have it ready in case of breakages relating to using JDK 21.

Change-Id: I153c4933f6891c7fff43e522a4d128acad6b6d47
 2024-03-07 21:22:00 +00:00
Treehugger Robot
092c3a56fb Merge "Switch to JDK 21" into main 2024-03-07 19:36:28 +00:00
Cole Faust
68a8cfb14b Merge "Replace starlark_import with hardcoded map" into main am: fb8356c4c0 am: 58a88793da 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2991105

Change-Id: I774b729b920a80cd0611d4da751394be88c1675f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 19:16:22 +00:00
Cole Faust
c6fd53246b Merge "Select statements" into main am: 140180dd5b am: fc0e574bdf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2962126

Change-Id: I857d9b60001d72716af653e48c833536947a64c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 19:15:55 +00:00
Cole Faust
256cfbee24 Remove starlark_import 
This is no longer used since the roboleaf cancellation.

Bug: 315353489
Test: m nothing --no-skip-soong-tests
Change-Id: Ie6ee093c2810498306ea4a2288050eed17a35357
 2024-03-07 10:53:41 -08:00
Cole Faust
58a88793da Merge "Replace starlark_import with hardcoded map" into main am: fb8356c4c0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2991105

Change-Id: Ie2560c1a6120d8329ffd29c2ec2c3e96ad17ca5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 18:31:18 +00:00
Cole Faust
fc0e574bdf Merge "Select statements" into main am: 140180dd5b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2962126

Change-Id: I9837ca6a7be06e75f718d3367b49bbfc75f0f637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 18:30:31 +00:00
Zi Wang
5ae58dcabe Merge "Add property Skip_jarjar_repackage" into main 2024-03-07 17:44:36 +00:00
Cole Faust
fb8356c4c0 Merge "Replace starlark_import with hardcoded map" into main 2024-03-07 17:39:35 +00:00
Cole Faust
140180dd5b Merge "Select statements" into main 2024-03-07 17:39:27 +00:00
Xin Li
63fca7f9d8 [automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 08bef285d8 -s ours am: e4f0a280fc -s ours 
am skip reason: Merged-In I0b63516865233df0bf125a2ee4098769a8991ecd with SHA-1 88763e8e40 is already in history

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

Change-Id: I59ac9774d1c12d65415f2c91d4dac086e8542016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 10:49:23 +00:00
Xin Li
93534bdad1 [automerger skipped] Merge Android 14 QPR2 to AOSP main am: 7e46832a1c -s ours am: 1521dc8d99 -s ours 
am skip reason: Merged-In I0b63516865233df0bf125a2ee4098769a8991ecd with SHA-1 88763e8e40 is already in history

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

Change-Id: Ib9f6bb2a8d764ffc31f1283a44b6e677dd3fc2fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 10:46:24 +00:00
Xin Li
e4f0a280fc [automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 08bef285d8 -s ours 
am skip reason: Merged-In I0b63516865233df0bf125a2ee4098769a8991ecd with SHA-1 88763e8e40 is already in history

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

Change-Id: I97b9147773776a942892e754d380fa71481cfd7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 09:58:02 +00:00
Xin Li
1521dc8d99 [automerger skipped] Merge Android 14 QPR2 to AOSP main am: 7e46832a1c -s ours 
am skip reason: Merged-In I0b63516865233df0bf125a2ee4098769a8991ecd with SHA-1 88763e8e40 is already in history

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

Change-Id: Ia1d6e85efdb9af29df0abac89b9f21dba52685fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 09:54:59 +00:00
Xin Li
08bef285d8 Merge "Merge Android 14 QPR2 to AOSP main" into main 2024-03-07 06:41:10 +00:00
Treehugger Robot
29b033724e Merge "Reverse order of transitive R.jar classpath entries" into main am: a7ee3e0482 am: 062f267f75 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2989233

Change-Id: I2c007077f05aa93ff5052a946950df990446e387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 02:23:11 +00:00
Treehugger Robot
062f267f75 Merge "Reverse order of transitive R.jar classpath entries" into main am: a7ee3e0482 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2989233

Change-Id: Icca0d53dcdccdc969f6f885060a3368059f17059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 01:39:10 +00:00
Yangfan Deng
42a815d586 Merge "Add wear-sdk.impl to the InstrumentFrameworkModule list so that classes for wear-sdk.impl library can be exported inside jacoco-report-classes-all.jar" into main 2024-03-07 01:32:53 +00:00
Treehugger Robot
a7ee3e0482 Merge "Reverse order of transitive R.jar classpath entries" into main 2024-03-07 00:50:53 +00:00
Cole Faust
5a231bd819 Select statements 
See the blueprint cl for more information.

Things still to do:
 - Support selecting on product variables and
   variants
 - Test/Support property struct reflection tags
   like arch_variant, path, and variant_prepend
 - Test that selects combine well with existing
   configurability mechanisms like arch:, target:,
   multilib:, python's version:, etc.

Bug: 323382414
Test: go tests
Change-Id: If5d1ea1ad0c4ebabffaea91d62e1a1c6f926a793
 2024-03-06 16:03:01 -08:00
Cole Faust
37bfb07722 Replace starlark_import with hardcoded map 
With roboleaf being cancelled, we don't need the api levels to be
present in starlark.

Bug: 315353489
Test: Presubmits
Change-Id: I21ea61ced00a5b0ae066a9ca99a88a512bf115ac
 2024-03-06 15:59:18 -08:00
Zi Wang
4332cd1cae Add property Skip_jarjar_repackage 
If this property is set to true on a module, this module will
not have jarjar repackaging.

Test: CI
Bug: 327009143
Ignore-AOSP-First: Will cp to aosp
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9bdd4228cb959d46a60610f3b0eb9b52b95a73ad)
Merged-In: I9384c9c25ce581ac00d309a188cf7533eb2e44a6
Change-Id: I9384c9c25ce581ac00d309a188cf7533eb2e44a6
 2024-03-06 18:58:05 +00:00