StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,378 Commits 1 Branch 0 Tags
7cec47c124bf54c2ba5cced6f85de392fbbc1d2c
Commit Graph

64378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jihoon Kang
7cec47c124 Merge "Update java_api_library in testing modules" am: 3bfba4c723 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2523975

Change-Id: Ib93ced0352c5e5c811ace60aeeff5093d99d27a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 00:07:24 +00:00
Jihoon Kang
3bfba4c723 Merge "Update java_api_library in testing modules" 2023-04-05 23:27:50 +00:00
Treehugger Robot
71321b2547 Merge "Fix issue merging bp2build files with handcrafted ones" am: dd5653bbf0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2523218

Change-Id: I73db06088477d0ae3eb259cb02e0594c95deb4a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 21:04:27 +00:00
Treehugger Robot
dd5653bbf0 Merge "Fix issue merging bp2build files with handcrafted ones" 2023-04-05 20:32:14 +00:00
Cole Faust
3f4f521711 Fix issue merging bp2build files with handcrafted ones 
It was possible for the merged content to end up back in the bp2build
generated file because there was a symlink from the symlink forest to
the bp2build generated file.

Remove the symlink if it exists.

Bug: 276349152
Test: m bp2build, add a handcrafted file in the same folder as a Android.bp file, m bp2build again, check that the symlink forest version is not a symlink
Change-Id: Id64aa3addebcf0c6b1728389f21ae246796aaf8d
 2023-04-05 09:08:38 -07:00
Romain Jobredeaux
e1a37d8189 Merge "Bp2build converter for java_host_for_device." am: 15807fa7ed 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2522155

Change-Id: Ie694676fedc1e091328861102f45cc35b2fddf8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 14:18:45 +00:00
Romain Jobredeaux
090223b966 Merge "Support arch variants in java's StaticLibs in bp2build" am: b2539d08ed 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2521437

Change-Id: I7b177788f363e756096125349730c5bc29a949ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 14:18:39 +00:00
Romain Jobredeaux
15807fa7ed Merge "Bp2build converter for java_host_for_device." 2023-04-05 13:32:29 +00:00
Romain Jobredeaux
b2539d08ed Merge "Support arch variants in java's StaticLibs in bp2build" 2023-04-05 13:32:29 +00:00
Yi Kong
6e9440fbee Prepend AFDO flags to allow overriding am: a1961e7eed 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2501638

Change-Id: I01a95de0ef3041763cf0d2def70677a62e3a8fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 07:30:11 +00:00
Yi Kong
a1961e7eed Prepend AFDO flags to allow overriding 
This enables turnning off -fprofile-sample-accurate on a per project
basis.

Bug: 274725934
Bug: 273415627
Test: presubmit
Change-Id: I15060950f7b55e51069cb00b66512c7e94981f1b
 2023-04-05 11:49:19 +09:00
Romain Jobredeaux
eb711b9f7c Support arch variants in java's StaticLibs in bp2build 
Test: Presubmits
Bug: 276901800
Change-Id: I6058a726833ef10a5f470946e2d265b20fa547ce
 2023-04-04 19:50:13 -04:00
Romain Jobredeaux
e7370eabe4 Bp2build converter for java_host_for_device. 
Change-Id: I70a345c641bbed3223dc6222062fb6948f7dc6cb
Bug: 276710283
Test: Presubmit
 2023-04-04 19:49:17 -04:00
Jihoon Kang
c0a24205a7 Update java_api_library in testing modules 
The full api surface java_api_library modules are currently defined as
java_library modules instead of java_api_library modules. This change
corrects this and modifies the DepsInfo of java_api_library so that it
can be compatible in tests.

Test: go ./java
Change-Id: I540b5a930f506ce5f7663ab6e07c6df49af15cf9
 2023-04-04 22:52:37 +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
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
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
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
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
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
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
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
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
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
Jiyong Park
3a00e3defb Assert that platform_sdk_codename is set 
This is already the case for bazel. Soong should do the same.

Bug: 271277773
Test: m nothing
Change-Id: Ibb680801872bd04eade511e1a174cc629af80722
 2023-04-03 20:36:40 +09:00
Treehugger Robot
5485148807 Merge "Remove stub-annotations from art stubs system modules" am: 1c102d34b7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2515531

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