Commit Graph

73260 Commits

Author SHA1 Message Date
Colin Cross
2488ed09f7 Don't call android.PathForModuleSrc(ctx).String() to get ModuleDir am: f96b001064
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2806397

Change-Id: Ic17bea5bfe5362592b96860d76e9e7f2c9c61522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 19:24:57 +00:00
Colin Cross
f96b001064 Don't call android.PathForModuleSrc(ctx).String() to get ModuleDir
ctx.ModuleDir is much cheaper than android.PathForModuleSrc(ctx).String().

Test: builds
Change-Id: I81819088d9564b06a0336a59a45f2b110b0bd9d6
2023-11-02 19:07:49 +00:00
Anas Sulaiman
165ae98f42 Merge "fix potential encoding issues in remote actions" into main am: 4e6c3ef59b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814456

Change-Id: Ie29583d6c620ff13963f2ff40296161c4f686caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 18:23:20 +00:00
Treehugger Robot
d33a5ff424 Merge "Remove pre singletons" into main am: 717e7769ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813820

Change-Id: I6791c36bfc1902b9d91fe39cd4fb9b4a6313884e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 18:22:30 +00:00
Anas Sulaiman
4e6c3ef59b Merge "fix potential encoding issues in remote actions" into main 2023-11-02 18:21:57 +00:00
Treehugger Robot
717e7769ce Merge "Remove pre singletons" into main 2023-11-02 18:04:52 +00:00
Jihoon Kang
377752881f Merge changes from topic "core-lambda-stubs-source" into main am: 412dc7c488
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814994

Change-Id: I38fbdaac417380bc248864ae294355aa4ef6c6c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 17:49:10 +00:00
Colin Cross
d72155f0ed Merge "Remove obsolete java version environment variables" into main am: f2c51919ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814561

Change-Id: I841987073791226e2daf55a11b41f32d98cdcbd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 17:47:30 +00:00
Jihoon Kang
412dc7c488 Merge changes from topic "core-lambda-stubs-source" into main
* changes:
  Remove TxtStubLibraries.bp
  Move core.module_lib.stubs.from-text closer to source
2023-11-02 17:08:11 +00:00
Cole Faust
ae6cda6f10 Remove pre singletons
They're no longer used.

Test: m nothing --no-skip-soong-tests
Change-Id: I8984164cfc1a062c428ea7f1a4dd5b8940bee84b
2023-11-02 10:05:55 -07:00
Colin Cross
f2c51919ad Merge "Remove obsolete java version environment variables" into main 2023-11-02 17:05:06 +00:00
Treehugger Robot
3028fabfd6 Merge "Revert "Add support for PRODUCT_RELEASE_CONFIG_MAPS"" into main am: 87706098b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813821

Change-Id: I676f9bb964b658a52641af17251a083fd92cbab3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 08:46:12 +00:00
Treehugger Robot
87706098b0 Merge "Revert "Add support for PRODUCT_RELEASE_CONFIG_MAPS"" into main 2023-11-02 08:06:39 +00:00
Treehugger Robot
ea40fe5277 Merge "Remove sdkPreSingleton and overlaySingleton" into main am: a741e88489
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813819

Change-Id: I39d69af62c6247cf544b8557d0d88e074c600a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 04:13:22 +00:00
Treehugger Robot
a741e88489 Merge "Remove sdkPreSingleton and overlaySingleton" into main 2023-11-02 03:43:15 +00:00
Jihoon Kang
6416a71211 Remove TxtStubLibraries.bp
The modules defined in TxtStubLibraries.bp are currently not in the
critical path of the from-text stub build, because the from-text vs
from-source switching is encapsulated within the stub library modules.
Therefore, remove the modules altogether.

Test: m nothing --build-from-text-stub
Bug: 287522618
Change-Id: I249edcdf596c8a82058e1bfb17da863c2b5dd7a7
2023-11-02 01:02:40 +00:00
Jihoon Kang
bfa2f9ec69 Move core.module_lib.stubs.from-text closer to source
This change moves the core.module_lib.stubs.from-text closer to its
from-source equivalents and its top level module core/module_lib.stubs.

Test: m nothing --build-from-text-stub
Bug: 287522618
Change-Id: Ida6dd613834b36490b1ad79773b9404b1d0d9efc
2023-11-02 01:02:28 +00:00
Colin Cross
f77b2cb534 Revert "Add support for PRODUCT_RELEASE_CONFIG_MAPS"
Revert submission 2787001-product-build-flags

Reason for revert: Possible cause of b/308849337

Reverted changes: /q/submissionid:2787001-product-build-flags

Bug: 302593603
Bug: 308849337
Change-Id: Id3f27eca8d39e854dee232f072a8dc6c561bac63
2023-11-02 00:13:30 +00:00
Treehugger Robot
54c1f3a86b Merge changes I7bc4d8d4,I8158c0b9 into main am: 9ae2999dab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2814560

Change-Id: I1f0d5a8b85485f51a2463894194c1cf7ce4d096f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 23:44:13 +00:00
Treehugger Robot
23cfb18a6b Merge "Add mount_point property to android_filesystem" into main am: b92dac45d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2813975

Change-Id: I516c1fb4b869e3e6d776315409121de99c966f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 23:43:40 +00:00
Treehugger Robot
9ae2999dab Merge changes I7bc4d8d4,I8158c0b9 into main
* changes:
  Use merge_zips instead of ziptime for resetting timestamps in jacoco outputs
  Always reset timestamps in merge_zips
2023-11-01 23:38:29 +00:00
Treehugger Robot
b92dac45d0 Merge "Add mount_point property to android_filesystem" into main 2023-11-01 23:32:27 +00:00
Cole Faust
9bef67488d Remove sdkPreSingleton and overlaySingleton
These were the only 2 pre-singletons in soong. sdkPreSingleton is
totally unused. overlaySingleton can be done during
GenerateAndroidBuildActions instead.

Test: m nothing --no-skip-soong-tests
Change-Id: Ieb5ab92f18cb56be4049c0842f61df8aa02dc52c
2023-11-01 15:29:09 -07:00
Colin Cross
c8c2cee06a Use merge_zips instead of ziptime for resetting timestamps in jacoco outputs
ziptime doesn't support ZIP64 so it is limited to 65535 entries in
a zip file.  Use the newly added support in merge_zips to reset the
timestamp instead.

Bug: 308765940
Test: builds
Change-Id: I7bc4d8d4943e7417af1783a63ac5b5904d2aa751
2023-11-01 14:41:48 -07:00
Colin Cross
fa24df6b23 Always reset timestamps in merge_zips
Jacoco uses ziptime and then merge_zips.  merge_zips is already rewriting
all the zip headers so its trivial to move the ziptime functionality
into merge_zips.

Bug: 308765940
Test: TestMergeZips
Change-Id: I8158c0b99878492233ac01fde3820e1951c9088e
2023-11-01 14:41:40 -07:00
Colin Cross
f059b2f2fc Remove obsolete java version environment variables
jdk9 and jdk11 are no longer used, remove ANDROID_JAVA9_HOME and
ANDROID_JAVA11_HOME.

Bug: 221270882
Test: treehugger
Change-Id: Iad566bff21055c5e2acd62642ccd579507e21fef
2023-11-01 20:58:30 +00:00
Spandan Das
a86290f27e Merge "Add the name of the sdk library to dynamically generated java modules" into main am: eb852927d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808372

Change-Id: I10282df38584510bd384c3750caad245b4ef9330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:50:52 +00:00
Anas Sulaiman
e208e856fd fix potential encoding issues in remote actions
The new docker image contains all en_*.UTF-8 locales to ensure Java (and
other) actions produce the correct bytes.

Bug: b/300624128
Test: Ran an android build and verified there are no encoding issues in
metalava outputs.

Change-Id: I89cd1b45ce3d8dc552c2afb859c1a5e221c5f238
2023-11-01 17:41:44 +00:00
Spandan Das
eb852927d4 Merge "Add the name of the sdk library to dynamically generated java modules" into main 2023-11-01 17:31:58 +00:00
Colin Cross
d4aefabb11 Merge "Support prebuilt_renderscript_bitcode modules" into main am: 3996ffbc13
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2810857

Change-Id: Ie32b03d9031cefce41f4ce1f1ce6ecdbe80bb38d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:15:04 +00:00
Colin Cross
5ed2c54040 Merge "Use correct path for soong_build_metrics.pb when dist is enabled" into main am: 2650f35faa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812554

Change-Id: I2ece35178fa0812f15116da88924b3676f59aee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 17:14:52 +00:00
Colin Cross
3996ffbc13 Merge "Support prebuilt_renderscript_bitcode modules" into main 2023-11-01 17:07:54 +00:00
Colin Cross
2650f35faa Merge "Use correct path for soong_build_metrics.pb when dist is enabled" into main 2023-11-01 16:54:14 +00:00
LaMont Jones
a159227c5e Merge "Add support for PRODUCT_RELEASE_CONFIG_MAPS" into main am: c416ddd1cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786983

Change-Id: Iba51c98de8f85658c11d5cc5626dbe9f1357c888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 16:10:32 +00:00
Sam Delmerico
92bacc72a1 Merge "transitive r8 flags for installable {android,java}_libraries" into main am: d9569528bd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812555

Change-Id: I3238b8f999bdde7038d119c8e9926b66d5f852ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 16:09:37 +00:00
LaMont Jones
c416ddd1cc Merge "Add support for PRODUCT_RELEASE_CONFIG_MAPS" into main 2023-11-01 16:01:08 +00:00
Sam Delmerico
d9569528bd Merge "transitive r8 flags for installable {android,java}_libraries" into main 2023-11-01 15:29:11 +00:00
Inseob Kim
376d72f791 Add mount_point property to android_filesystem
The motivation is to support vendor images for microdroid, like the real
vendor images having "/vendor" as their mount point. This will help add
vendor_file_contexts easily.

Bug: 306313100
Test: manually build an image with file_contexts
Change-Id: I2e4bbf108eaa1da4f310ebb4099c4d1b42096436
2023-11-01 15:42:14 +09:00
Jooyung Han
65ecec24c8 Merge changes from topic "fix-apexkeys" into main am: 78a658b81f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808897

Change-Id: I214274d2e5c1d2b1b074b359a2ea2645ffbbd2bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 05:35:26 +00:00
Jooyung Han
2aa64a6139 Refactor around apexKeysText singleton am: 2cf35e7bfd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808896

Change-Id: Ie660846cabebcd6cd65d2abb236676e7e46d00fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 05:35:23 +00:00
Yi Kong
4215f1fcb3 Merge "Add option to emit ThinLTO indexes and imports for MLGO training" into main am: bc9d35168c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2812353

Change-Id: Id79172f6ad0bb0bb87da0511de0ee70034f8b835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01 05:35:03 +00:00
Jooyung Han
78a658b81f Merge changes from topic "fix-apexkeys" into main
* changes:
  Rewrite how to generate apexkeys.txt
  Refactor around apexKeysText singleton
2023-11-01 05:13:06 +00:00
Yi Kong
bc9d35168c Merge "Add option to emit ThinLTO indexes and imports for MLGO training" into main 2023-11-01 05:12:25 +00:00
Colin Cross
b67b061baa Use correct path for soong_build_metrics.pb when dist is enabled
When dist is enabled soong_build_metrics.pb is written to $DIST_DIR/logs,
not $OUT_DIR.

Test: m dist nothing, examine out/dist/logs/bulid.trace.gz
Change-Id: Ia41de6c838ecbcf0acca1e7ec7e68ba24dce2b32
2023-10-31 23:52:38 +00:00
Treehugger Robot
44fb88a40d Merge "fix some moved code from revert of aosp/2518976" into main am: 9301b11e06
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2799557

Change-Id: Idbaa0942e02f72d783da099b64db7f8575873ca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 23:29:22 +00:00
Treehugger Robot
841d5b77e4 Merge "Remove AudioFocusControlProtoStub_cc/h from denylist" into main am: 10d0f9339b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2803012

Change-Id: I41f602a25fa667d06e909f7f1d79de640ee397ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 23:29:02 +00:00
Treehugger Robot
9301b11e06 Merge "fix some moved code from revert of aosp/2518976" into main 2023-10-31 23:25:01 +00:00
Treehugger Robot
10d0f9339b Merge "Remove AudioFocusControlProtoStub_cc/h from denylist" into main 2023-10-31 22:50:14 +00:00
Spandan Das
2cc80ba145 Add the name of the sdk library to dynamically generated java modules
The name of the sdk library will be used in source vs prebuilt
selection. For soong modules that are not dynamically created from a
java_sdk_library, the value will be nil.

Bug: 308174768
Test: TH
Change-Id: Ic7e9889f00c6184992b663a7124967bb0794d475
2023-10-31 20:57:56 +00:00
Cole Faust
0605687dd6 Remove AudioFocusControlProtoStub_cc/h from denylist
Test: m AudioFocusControlProtoStub_cc AudioFocusControlProtoStub_h
Change-Id: I7743f1d7d05caa9c14c7257fb117d07d02b7edaf
2023-10-31 13:07:40 -07:00