Commit Graph

38015 Commits

Author SHA1 Message Date
Paul Duffin
ea7b6c1184 Merge "Extract preparer for namespace" am: bea17eff14
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1761487

Change-Id: Ie12de5c23280c133a4460fc5c814f04d91ac96f8
2021-07-12 17:56:12 +00:00
Paul Duffin
bea17eff14 Merge "Extract preparer for namespace" 2021-07-12 17:44:48 +00:00
Paul Duffin
9e36fa0eda Move modules containing ART, conscrypt and i18n from libcore am: bb360c32b6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1762226

Change-Id: Iea8772aa89c796255f264ff032698486974bbe7c
2021-07-12 12:17:10 +00:00
Paul Duffin
bb360c32b6 Move modules containing ART, conscrypt and i18n from libcore
This change moves the definitions of the following libraries which
directly include ART, conscrypt and i18n stubs, and their associated
java_system_modules from libcore to build/soong/java/core-libraries.
* core.current.stubs
* core-current-stubs-system-modules
* core.module_lib.stubs
* core-module-lib-stubs-system-modules
* legacy.core.platform.api.stubs
* legacy-core-platform-api-stubs-system-modules
* stable.core.platform.api.stubs
* stable-core-platform-api-stubs-system-modules

Bug: 193311122
Test: m droid
Change-Id: I42c4a0b5322897d40ecf41de088152dbdc526c96
2021-07-12 10:10:42 +01:00
Paul Duffin
4fbfb59d3e Extract preparer for namespace
Bug: 193228441
Test: m nothing
Change-Id: If00b0595edd48be8c8d3308b87fb920dfb0340ee
2021-07-09 23:54:01 +01:00
Liz Kammer
60cd3b9609 Merge changes If89b7d0b,I630c06f0,Id861a62b,If71bb468 am: 1a0e2d20b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1749407

Change-Id: If50ef28db4d9d6e821119bf4ae669fd43c31bef5
2021-07-09 21:02:44 +00:00
Liz Kammer
1a0e2d20b3 Merge changes If89b7d0b,I630c06f0,Id861a62b,If71bb468
* changes:
  Iterate over sanitizers
  Update memtag code behavior to match comment.
  Reorganize memtag tests for clarity.
  Add comments to sanitizer properties.
2021-07-09 20:43:21 +00:00
Yuntao Xu
314e9e6423 Merge "modify cc_binary type to cc_test for test modules" am: ec04417506
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1758945

Change-Id: I005a4d947eeb7123ab26ff1e0acc69db083e60c4
2021-07-09 16:55:53 +00:00
Yuntao Xu
ec04417506 Merge "modify cc_binary type to cc_test for test modules" 2021-07-09 16:38:11 +00:00
Yuntao Xu
8f884a0a69 modify cc_binary type to cc_test for test modules
1. When a cc_binary type module has the non-empty test_suites field,
modify the type to cc_test;
2. Unit tests were also added.

Bug: 193071602
Test: m androidmk
Test: TreeHugger
Change-Id: Icfaa79998616c02bb086f81d194163feafb4c116
2021-07-08 15:13:25 -07:00
Liz Kammer
75db931843 Iterate over sanitizers
Test: go test soong tests
Change-Id: If89b7d0b04cad79b42a08504d4fcff36e914b7a4
2021-07-08 11:19:15 -04:00
Liz Kammer
7b920b4057 Update memtag code behavior to match comment.
Test: go test soong tests
Change-Id: I630c06f01c90256b1990c37b9236e8967a5fa316
2021-07-08 11:19:15 -04:00
Liz Kammer
d56ddb5482 Reorganize memtag tests for clarity.
Test: go test soong tests
Change-Id: Id861a62bd0ff2b6a5a4354fbda939e9ebb13a2a5
2021-07-08 11:19:15 -04:00
Liz Kammer
75b9b40a56 Add comments to sanitizer properties.
Test: n/a
Change-Id: If71bb4683a4ae969670235c51b3f1b3af2073f91
2021-07-08 11:19:12 -04:00
Liz Kammer
1d9b80262e Merge changes I770f5ce7,I32d4417d am: 4aa48b03ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1749405

Change-Id: Ifa7e1d2b6e3a8bcd2d0957ba1adc5bc302e32ce4
2021-07-08 13:26:23 +00:00
Liz Kammer
4aa48b03ea Merge changes I770f5ce7,I32d4417d
* changes:
  Remove IsDependencyRoot from interface
  Delete local boolPtr function
2021-07-08 13:11:17 +00:00
Treehugger Robot
968f5b4a73 Merge "Revert "Flag to control if generated SDK prebuilts are preferred."" am: af60f411f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1758189

Change-Id: I21e7f7ebd3efa5ce11239068ef6989465809bb66
2021-07-07 21:05:34 +00:00
Treehugger Robot
af60f411f8 Merge "Revert "Flag to control if generated SDK prebuilts are preferred."" 2021-07-07 20:49:14 +00:00
Liz Kammer
187d5445e8 Remove IsDependencyRoot from interface
This is equivalent to Binary() -- reduce the interface and improve
clarity.

Test: go test soong tests
Change-Id: I770f5ce79fd4d888586d31ec5e67be88153626b6
2021-07-07 16:29:09 -04:00
Liz Kammer
b2fc4700de Delete local boolPtr function
This is defined in proptools, no need to duplicate.

Test: go test soong tests
Change-Id: I32d4417dc4ae73bff98f36360ed22aed572d8c18
2021-07-07 16:29:09 -04:00
Mathew Inwood
7e9ddbe8c8 Revert "Flag to control if generated SDK prebuilts are preferred."
This reverts commit d0b99cea0a.

Reason for revert: Not needed anymore. We will simple exclude the 
gernated Android.bp files from prebuilt drops instead, it keeps
things simpler.

Change-Id: I5b01b2e01197f9fceb4630c8ade95f0d1d0f33f4
2021-07-07 12:47:51 +00:00
Paul Duffin
9dfd930cf7 Generate boot images for host from prebuilts am: a56be7d781
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1757170

Change-Id: I21e0bd7ef439def519797f6a9e09857d23c9d276
2021-07-06 15:17:14 +00:00
Paul Duffin
371276f582 Switch boot image generation to use GetGlobalSoongConfig(ctx) am: 8fc51a8eb6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1757169

Change-Id: I5cbc7fd0f5046031337afef2ec495088544f2438
2021-07-06 14:57:18 +00:00
Paul Duffin
a56be7d781 Generate boot images for host from prebuilts
Previously, when building from prebuilts boot no rules were created to
produce the boot image files for the host, i.e. the OS on which the
build was running. That caused problems with checkbuilds. No rules were
produced as there was no host variant of a prebuilt apex to provide
them.

This change restructures the code to allow the prebuilt bootclasspath
fragment to build the host variants of the files from the dex files
provided by the prebuilt APEX. The generated files will not be the same
as they would be if built from source as there is no boot image profile
to use but it should be sufficient to satisfy the checkbuild target and
allow for host side testing.

Bug: 192575099
Test: m SOONG_CONFIG_art_module_source_build=false droid dist checkbuild
Change-Id: I6af00f19bb71aa18dd462f5eac6aa38e3e721023
2021-07-06 13:45:46 +01:00
Paul Duffin
8fc51a8eb6 Switch boot image generation to use GetGlobalSoongConfig(ctx)
Previously, boot image generation used GetCachedGlobalSoongConfig(ctx)
in order to get access to the GlobalSoongConfig. That required that
some other part of the code had called GetGlobalSoongConfig(ctx) to
initialize the cached value. That was left over from when the boot
image generation was done in a singleton which could not call
GetGlobalSoongConfig(ctx) directly. That is no longer true.

This change switches the uses of GetCachedGlobalSoongConfig(ctx) to
GetGlobalSoongConfig(ctx) and removes the now unnecessary call to
GetGlobalSoongConfig(ctx) from outside the functions.

Bug: 192575099
Test: m nothing
Change-Id: I34b7b1526d072d8b09fda7caa96e381695888e16
2021-07-06 12:51:04 +01:00
Paul Duffin
019e278025 Merge "Generate boot zip file from prebuilt_bootclasspath_fragment" am: 452decbd88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1753271

Change-Id: I0ea32f281f2ec9b87aaca12ce2f800705d8f94fc
2021-07-05 12:12:22 +00:00
Paul Duffin
452decbd88 Merge "Generate boot zip file from prebuilt_bootclasspath_fragment" 2021-07-05 12:01:46 +00:00
Paul Duffin
31620af91d Merge "Use both module name and stem name to filter updatable boot jars" am: 276fd424ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1748051

Change-Id: I7bbd3ae508a06fb544d9da8c4414fc5baaf64445
2021-07-02 21:04:44 +00:00
Paul Duffin
276fd424ad Merge "Use both module name and stem name to filter updatable boot jars" 2021-07-02 20:41:07 +00:00
Rupert Shuttleworth
37b29c925c Add partial bp2build support for APEX targets (second try). am: a9d76dd423
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1755109

Change-Id: Iad07897a10e7ea8067b5c892188596b44efc2cba
2021-07-02 13:24:55 +00:00
Rupert Shuttleworth
a9d76dd423 Add partial bp2build support for APEX targets (second try).
Test: Added unit test
Change-Id: Icbf0475251aac5d1f13bd35a18f90b6c70f3ae29
2021-07-02 07:36:07 -04:00
Treehugger Robot
5caf0040d1 Merge "Include static lib information for the snapshot modules" am: 503e3a10b2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1751245

Change-Id: I96414fa69aa86706d20433540f5b13033a559a58
2021-07-02 00:19:24 +00:00
Treehugger Robot
d6f6a86e34 Merge "Delete unused functions" am: 31b9a0c9da
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1749403

Change-Id: I7fafe84b9226f1bf6a0cccf7fc8c3f5af8845b30
2021-07-01 23:59:05 +00:00
Colin Cross
07e6d28f61 Merge "Export NewPrebuiltObject" am: 34d52eed1e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1747998

Change-Id: Ifb3561a19ff692c125b7b265b11e72502aacd8af
2021-07-01 23:38:40 +00:00
Treehugger Robot
503e3a10b2 Merge "Include static lib information for the snapshot modules" 2021-07-01 22:24:33 +00:00
Treehugger Robot
31b9a0c9da Merge "Delete unused functions" 2021-07-01 22:20:04 +00:00
Paul Duffin
56afb27fb0 Generate boot zip file from prebuilt_bootclasspath_fragment
Previously, the boot zip file, containing all the boot image files for
all the supported architectures, was only created from source. It was
not created when building from a prebuilt_bootclasspath_fragment. That
lead to build failures when building from ART prebuilts.

This change pulls the boot zip file creation out so that it can be done
for both source and prebuilt bootclasspath_fragment modules as well as
for the platform_bootclasspath module.

Bug: 192575099
Test: m out/target/product/generic_arm64/boot.zip
      m SOONG_CONFIG_art_module_source_build=false out/target/product/generic_arm64/boot.zip
      - Compare the output of the first command from before the change
        with the output from them both after and confirm that when the
        ART prebuilts are up to date with the source that there are no
        differences.
Change-Id: Ie7dd5e2ca4a865d06fd9ebf87320cf68c4d05bc3
2021-07-01 22:17:49 +01:00
Colin Cross
34d52eed1e Merge "Export NewPrebuiltObject" 2021-07-01 20:53:24 +00:00
Colin Cross
9338f2f263 Merge "Support shared_libs, static_libs and default_shared_libs in cc_object" am: 8c3339f74c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1743044

Change-Id: Ic62ed4cfbe3286b8f6f98ea3b736176d03686cfc
2021-07-01 19:29:20 +00:00
Colin Cross
8c3339f74c Merge "Support shared_libs, static_libs and default_shared_libs in cc_object" 2021-07-01 19:00:40 +00:00
satayev
015ca2f4b9 Merge "Use system stubs for framework-doc-system-stubs." am: 8e3356f610
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1745338

Change-Id: I41dc2d687c84a25211346a1a1f67af822e266505
2021-07-01 17:33:33 +00:00
satayev
8e3356f610 Merge "Use system stubs for framework-doc-system-stubs." 2021-07-01 17:21:36 +00:00
Treehugger Robot
67dce773fe Merge "Flag to control if generated SDK prebuilts are preferred." am: 1a58d1a815
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1713989

Change-Id: I83b04380601afb1c89a6c66209a3f5eebc3c9fdc
2021-07-01 14:46:30 +00:00
Treehugger Robot
1a58d1a815 Merge "Flag to control if generated SDK prebuilts are preferred." 2021-07-01 14:29:01 +00:00
Justin Yun
5e03586365 Include static lib information for the snapshot modules
snapshot modules require the list of static libs to find the NOTICE
files for the snapshot modules.
snapshot binaries must include static_executable property to check if
non static binaries have libc as a static lib.

Bug: 190690041
Test: Check NOTICE for libaudiopreprocessing.so built from snapshots.
Change-Id: I53f7549a158ab27ada87833a3f4d58620aa7c3cf
2021-07-01 11:42:28 +00:00
Paul Duffin
032a126e75 Merge "Defer error reporting of missing prebuilt dex jar files" am: 4b51e27046
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1751341

Change-Id: I9620c353d54c07fe9b07854d0483f8955bbba3cd
2021-07-01 11:07:23 +00:00
Paul Duffin
4b51e27046 Merge "Defer error reporting of missing prebuilt dex jar files" 2021-07-01 10:55:16 +00:00
Orion Hodson
472603d46f Merge ""module_current" and "system_server_current" should contain ART's @SystemApi(MODULE_LIBRARIES)" am: 39924233e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1748050

Change-Id: I2aec1a7220ba95db950c59332d709091e34044dc
2021-07-01 09:46:44 +00:00
Orion Hodson
39924233e0 Merge ""module_current" and "system_server_current" should contain ART's @SystemApi(MODULE_LIBRARIES)" 2021-07-01 09:43:41 +00:00
Paul Duffin
0b11f6c748 Merge "Support using java_sdk_library components in stub_libs" am: f03aaf5fc7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1752643

Change-Id: I4bc60c3680fc2fa94ba12731b7f5179f8d5e3212
2021-07-01 09:41:15 +00:00