Commit Graph

37326 Commits

Author SHA1 Message Date
Paul Duffin
8eee268aa7 Merge "Move generation of hidden API make vars to platform_bootclasspath" am: ad7fa97f8d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690548

Change-Id: Ie6250e02f8ca02cdaf2d43db3c7f9925f5690c14
2021-04-29 20:51:04 +00:00
Paul Duffin
5983d856c1 Merge "Fix build failure when building unbundled apps" 2021-04-29 20:19:54 +00:00
Paul Duffin
ad7fa97f8d Merge "Move generation of hidden API make vars to platform_bootclasspath" 2021-04-29 20:14:16 +00:00
Paul Duffin
c027119e73 Fix build failure when building unbundled apps
Bug: 186695448
Bug: 185828824
Test: tapas Calendar
      m -j60
Change-Id: I1c5365f6d2afb2f2d159e6f6ed004647ec6d2427
2021-04-29 19:50:40 +01:00
Paul Duffin
8c7c87d7d7 Merge "Make platform_bootclasspath a singleton module" am: 86477cfeb2 am: 4b00abc5f7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690547

Change-Id: I563e1ba0994e692f48e4c247ccc0541ac408908d
2021-04-29 18:28:09 +00:00
Paul Duffin
4b00abc5f7 Merge "Make platform_bootclasspath a singleton module" am: 86477cfeb2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1690547

Change-Id: I5fe5f37dfc470674f7a7fe7907584ccaf0ea1d7a
2021-04-29 18:11:24 +00:00
Paul Duffin
86477cfeb2 Merge "Make platform_bootclasspath a singleton module" 2021-04-29 17:56:21 +00:00
Andrei Onea
4985e518f8 Exclude RequiresApi from generated stubs
This annotation is required for linting, but is not useful in stubs.

Bug: 185579441
Test: cherry-pick http://ag/14098354 and regenerate stubs
Change-Id: I7e4da99a8843b9c709f3b59f125f43cbd66bda4e
2021-04-29 17:00:46 +00:00
Colin Cross
0d2aae4366 Merge "Remove global state from vendor public libraries" am: e07056af41 am: ce7b244e33
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1689271

Change-Id: Ic27f656fcc2ac3f9c4be65e0547698476387cbc1
2021-04-29 16:49:19 +00:00
Colin Cross
ce7b244e33 Merge "Remove global state from vendor public libraries" am: e07056af41
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1689271

Change-Id: Id1e7b1e3d379698281ede2606c5e19e7922198aa
2021-04-29 16:31:40 +00:00
Colin Cross
e07056af41 Merge "Remove global state from vendor public libraries" 2021-04-29 16:16:42 +00:00
Vladimir Marko
14e6512a02 Merge "Fix profileCommand to remove the profile first." am: 8e4cd8883a am: 9f8079dc42
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1689753

Change-Id: Ia3a73c78106776577ae8cb9d429f4d589816b45c
2021-04-29 15:09:29 +00:00
Vladimir Marko
9f8079dc42 Merge "Fix profileCommand to remove the profile first." am: 8e4cd8883a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1689753

Change-Id: I4be2352e65fc8eaa4c2d394dc0c6f16b5944a6d8
2021-04-29 14:51:30 +00:00
Vladimir Marko
8e4cd8883a Merge "Fix profileCommand to remove the profile first." 2021-04-29 14:24:00 +00:00
Paul Duffin
12d29b7786 Move generation of hidden API make vars to platform_bootclasspath
Bug: 179354495
Test: rm out/soong/make_vars*
      m nothing
      grep INTERNAL_PLATFORM_HIDDENAPI_FLAGS out/soong/make_vars*
      - make sure it is still out/soong/hiddenapi/hiddenapi-flags.csv
Change-Id: I86e56512a9a2091f446bad25294d41ea1f4341ee
2021-04-29 15:11:35 +01:00
Inseob Kim
08758f08e9 Add debug ramdisk variant.
A module will be installed to /debug_ramdisk if debug_ramdisk is set to
true.

This is a reland of f84e9c05e2, with a fix
that removes /first_stage_ramdisk.

Bug: 184004542
Test: soong test
Change-Id: I739de63cfec6b0fec5a90f7c4741fc4d884d209c
2021-04-29 22:58:17 +09:00
Paul Duffin
f062acb20b Merge "Move dumpOatRules to platform_bootclasspath" am: 3f9c16af2d am: 58da3e8a80
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686128

Change-Id: I8d86338ade67b51e019b558ab1a38e855654c58e
2021-04-29 12:53:04 +00:00
Paul Duffin
ae23514b50 Merge "Move generateUpdatableBcpPackagesRule to platform_bootclasspath" am: e084f1d717 am: b72a9487b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686154

Change-Id: I23c5d58bc071017b40a4c6988e9550e5ab102ef6
2021-04-29 12:53:01 +00:00
Paul Duffin
cba4d88707 Merge "Differentiate between art, non-updatable and updatable modules" am: c1fc9faee6 am: c1c4b84478
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686153

Change-Id: I63837609ea1a88ef2223d9317e5b79fe7658b0e8
2021-04-29 12:52:57 +00:00
Paul Duffin
8255b2c5d1 Merge changes I16389102,I105f4fba am: 12206326d6 am: bbc5cbcf0f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1689752

Change-Id: I0fcae956aba20eb4c2db993396e74bb7949b3700
2021-04-29 12:52:54 +00:00
Paul Duffin
58da3e8a80 Merge "Move dumpOatRules to platform_bootclasspath" am: 3f9c16af2d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686128

Change-Id: I1ac493e94b9435f0012d7666649ea633b591d989
2021-04-29 12:37:28 +00:00
Paul Duffin
b72a9487b8 Merge "Move generateUpdatableBcpPackagesRule to platform_bootclasspath" am: e084f1d717
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686154

Change-Id: Ibe80a497052b3835cbd1b9a830357731f1e95562
2021-04-29 12:37:22 +00:00
Paul Duffin
e3ecce67c1 Make platform_bootclasspath a singleton module
This is needed in order to allow it to implement MakeVars so it can
create make variables just like the dexpreopt_bootjars and hiddenapi
singletons currently do.

Bug: 177892522
Bug: 179354495
Test: m nothing
Change-Id: Ida5bf8abeecde531e1f6430151650065445804ac
2021-04-29 13:37:16 +01:00
Paul Duffin
c1c4b84478 Merge "Differentiate between art, non-updatable and updatable modules" am: c1fc9faee6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686153

Change-Id: I3c7dbdd542075b8c1ba477ab6f74b1e12c4c233c
2021-04-29 12:37:14 +00:00
Paul Duffin
bbc5cbcf0f Merge changes I16389102,I105f4fba am: 12206326d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1689752

Change-Id: Ida86926b0fc80b47228ff2975b714cb9af50a4dd
2021-04-29 12:36:24 +00:00
Paul Duffin
3f9c16af2d Merge "Move dumpOatRules to platform_bootclasspath" 2021-04-29 12:24:34 +00:00
Paul Duffin
e084f1d717 Merge "Move generateUpdatableBcpPackagesRule to platform_bootclasspath" 2021-04-29 12:20:17 +00:00
Paul Duffin
c1fc9faee6 Merge "Differentiate between art, non-updatable and updatable modules" 2021-04-29 12:20:06 +00:00
Paul Duffin
12206326d6 Merge changes I16389102,I105f4fba
* changes:
  Extract logic to gather deps added for <apex>:<module> pairs
  Treat "apex" system_ext the same as platform
2021-04-29 12:19:53 +00:00
Jingwen Chen
5ada02a02f Merge "bp2build: make libdl build." am: a4a930feef am: b5267deaf2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688296

Change-Id: I209491d4f37abd468deba76eb958b7b055da9120
2021-04-29 11:07:54 +00:00
Jingwen Chen
b5267deaf2 Merge "bp2build: make libdl build." am: a4a930feef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1688296

Change-Id: Iddf0295563de1a7662dc75fc229dc0a87805e6bd
2021-04-29 10:51:15 +00:00
Paul Duffin
f7a5592d38 Move dumpOatRules to platform_bootclasspath
Bug: 177892522
Test: m oat-dump-boot
      - test output to make sure that this change does not change the
        generated files, at least no more than no changes do as the
	output from this rule is not deterministic. See b/186459873.

Change-Id: Ib2b4203d9bb1fd0ee9443aee4e58b54b38b491cf
2021-04-29 11:50:48 +01:00
Paul Duffin
4c094428a7 Move generateUpdatableBcpPackagesRule to platform_bootclasspath
Changes generateUpdatableBcpPackagesRule to use ModuleContext instead
of SingletonContext and moves the call from dexpreoptBootJar's
GenerateSingletonBuildActions method to platform_bootclasspath's
GenerateAndroidBuildActions.

Bug: 177892522
Test: lunch art_module_arm64
      m out/soong/module_arm64/dex_bootjars/updatable-bcp-packages.txt
      - make sure it is not affected by this change
Change-Id: I9741ae1eb9573cafe12dd7a17dc1d8449b224dc8
2021-04-29 11:50:48 +01:00
Paul Duffin
01b463bc06 Differentiate between art, non-updatable and updatable modules
Bug: 177892522
Test: lunch art_module_arm64
      m out/soong/module_arm64/dex_bootjars/updatable-bcp-packages.txt
      - make sure it is not affected by this change
Change-Id: I3d35f1664cbbaba5df3f5809859dd9815a26d05d
2021-04-29 11:50:42 +01:00
Paul Duffin
9bacf56564 Extract logic to gather deps added for <apex>:<module> pairs
Trades having to traverse a module's direct dependencies multiple times
for reusable code. While at the minute the amount of duplicated code is
small (checking a tag and appending to a list) follow up changes will
modify the gatherApexModulePairDepsWithTag module to improve error
reporting greatly increasing the benefit of deduping.

The cost of traversing a module's direct dependencies is very small as
there will be only a very few dependencies.

Bug: 177892522
Test: m nothing
Change-Id: I16389102abd8038e1bfa52b63f4153bdf92ff553
2021-04-29 11:34:59 +01:00
Paul Duffin
454efed2ed Merge "Add stub_libs properties to bootclasspath_fragment snapshot" am: 50599f7735 am: ce7396186d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686206

Change-Id: I03ad268a1e143379747212c9724ad90c3ab5865c
2021-04-29 10:17:37 +00:00
Jingwen Chen
a4a930feef Merge "bp2build: make libdl build." 2021-04-29 10:14:26 +00:00
Paul Duffin
ce7396186d Merge "Add stub_libs properties to bootclasspath_fragment snapshot" am: 50599f7735
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686206

Change-Id: I4252cf0e5526977b95ec5af671914e987ce547e6
2021-04-29 09:53:58 +00:00
Paul Duffin
e30368dc81 Merge "Add support for specifying api provided by bootclasspath_fragment" am: 0948060f50 am: 126a48b0c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686205

Change-Id: If9064df010fb534a0622024a9be8677f5ccc8b04
2021-04-29 09:46:14 +00:00
Paul Duffin
110b0add9e Treat "apex" system_ext the same as platform
Change https://r.android.com/1672245 added support to treat
system_ext:foo in the boot jars configuration the same as platform:foo,
at least for dexpreopt_bootjars.go's getBootJar.

This change replicates that mechanism in platform_bootclasspath and as
that now handles hidden API processing also made a similar change in
the isModuleInConfiguredList function.

Bug: 177892522
Bug: 154976937
Test: m nothing
Change-Id: I105f4fbaa3b0355b013b7c5618d218d888faefb6
2021-04-29 10:35:10 +01:00
Paul Duffin
50599f7735 Merge "Add stub_libs properties to bootclasspath_fragment snapshot" 2021-04-29 09:34:38 +00:00
Paul Duffin
126a48b0c5 Merge "Add support for specifying api provided by bootclasspath_fragment" am: 0948060f50
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686205

Change-Id: I71526857f54c725257467975f20937a1bd2faa78
2021-04-29 09:22:32 +00:00
Paul Duffin
0948060f50 Merge "Add support for specifying api provided by bootclasspath_fragment" 2021-04-29 09:10:07 +00:00
Jingwen Chen
53681ef590 bp2build: make libdl build.
This CL adds support for the static and shared props, forwarding
whole_static_libs and srcs to the underlying shared library's
static_deps and static library's srcs respectively.

Test: TH
Fixes: 186609667
Change-Id: I84f838361c7758b256b2a163af894c502de03109
2021-04-29 08:59:02 +00:00
Vladimir Marko
982e384a63 Fix profileCommand to remove the profile first.
This fixes a discrepancy between clean and incremental
builds exposed by
    https://android-review.googlesource.com/1671710 .

Test: m
Bug: 148067697
Change-Id: I0de078045075417a4123f7c3821c723f1e8e6b68
2021-04-29 09:10:30 +01:00
Treehugger Robot
237cf8208a Merge "bp2build: convert //external/arm-optimized-routines/..." am: af44591fbe am: 56a2ac8cd7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1689686

Change-Id: I69fb607c420d95dbc561f2ef67329ad58f6d54f5
2021-04-29 06:44:47 +00:00
Treehugger Robot
56a2ac8cd7 Merge "bp2build: convert //external/arm-optimized-routines/..." am: af44591fbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1689686

Change-Id: I7deb6ada01914448b7d42f38e4752394f126eadb
2021-04-29 06:29:53 +00:00
Treehugger Robot
af44591fbe Merge "bp2build: convert //external/arm-optimized-routines/..." 2021-04-29 05:58:25 +00:00
Colin Cross
4646975e32 Merge "Remove obsolete llndk_library" am: 5423a9c513 am: d9be64ea31
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687470

Change-Id: I3add9094dc4bd11855f5f98b5e5f0bdf96ae4930
2021-04-29 03:00:40 +00:00
Colin Cross
d9be64ea31 Merge "Remove obsolete llndk_library" am: 5423a9c513
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1687470

Change-Id: I503f60464bff0d80da1029c2fae571fcdf389f63
2021-04-29 00:14:26 +00:00