StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,399 Commits 1 Branch 0 Tags
fd609b6bb0ee126a95cc097fb4dc5ff658224f72
Commit Graph

43399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Duffin
fd609b6bb0 Merge "Combine hidden API encoding with flag generation" am: 975e757232 am: b9b5bcf0e3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736225

Change-Id: I3197f3def4688fdeaeddc920cc55fc6364599b9a
 2021-06-17 16:36:40 +00:00
Paul Duffin
b9b5bcf0e3 Merge "Combine hidden API encoding with flag generation" am: 975e757232 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736225

Change-Id: I16158c1f154b52e29482d9b35b87d8828b92b58b
 2021-06-17 16:22:10 +00:00
Paul Duffin
975e757232 Merge "Combine hidden API encoding with flag generation" 2021-06-17 16:03:22 +00:00
Lukács T. Berki
ed539ad624 Merge "Make the IsSdkVariant field and method the same." am: 419117ee89 am: 288dc903aa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738338

Change-Id: If641ea419f7458f7650085404b64da4f041c05c9
 2021-06-17 12:12:56 +00:00
satayev
ec005143de Merge "Rename ClasspathFragmentToConfiguredJarList methods to configuredJars." am: 68c8dd019c am: 46a327565f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738335

Change-Id: Ia3c53337ba7ebd0742e39c091da834824f5da556
 2021-06-17 12:12:48 +00:00
Lukács T. Berki
288dc903aa Merge "Make the IsSdkVariant field and method the same." am: 419117ee89 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738338

Change-Id: I8a0874b1477059293612333de68459592752a6d3
 2021-06-17 11:56:40 +00:00
satayev
46a327565f Merge "Rename ClasspathFragmentToConfiguredJarList methods to configuredJars." am: 68c8dd019c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738335

Change-Id: I877ff28de478172f66cef3fd5cd44cb5058ff193
 2021-06-17 11:55:43 +00:00
Lukács T. Berki
419117ee89 Merge "Make the IsSdkVariant field and method the same." 2021-06-17 11:48:00 +00:00
satayev
68c8dd019c Merge "Rename ClasspathFragmentToConfiguredJarList methods to configuredJars." 2021-06-17 11:43:37 +00:00
Treehugger Robot
b1ae883f64 Merge "Use IsEnvTrue for USE_BAZEL_ANALYSIS check." am: 2d16ec5af7 am: 2009a3d70d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738873

Change-Id: Id1b3dce642cdbe875cc7a59a0cb4426c1c584c64
 2021-06-17 11:16:35 +00:00
Treehugger Robot
2009a3d70d Merge "Use IsEnvTrue for USE_BAZEL_ANALYSIS check." am: 2d16ec5af7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738873

Change-Id: Ice8ab71e72469b84e8af5b38ae537bd71fe71783
 2021-06-17 11:01:12 +00:00
Treehugger Robot
2d16ec5af7 Merge "Use IsEnvTrue for USE_BAZEL_ANALYSIS check." 2021-06-17 10:48:59 +00:00
Paul Duffin
e521881bd4 Combine hidden API encoding with flag generation 
Previously, the rules to perform hidden API encoding were generated
separately to the rules to perform hidden API flag generation. This
change combines them within the (renamed) produceHiddenAPIOutput()
method and makes the paths to the encoded dex files an output of the
generateHiddenAPIBuildActions method alongside the paths to the
generated flag files.

As encoded dex jars are now an output of the produceHiddenAPIOutput()
method which is implemented for both prebuilts and source
bootclasspath_fragment modules that necessitated the prebuilt also
providing paths to encoded dex files. That in turn required updates to
some of the tests to provide dex files from prebuilt_apex modules.

Similarly, as the produceHiddenAPIOutput() method may not be called
for some bootclasspath_fragment modules as they do not yet provide all
the information needed to perform hidden API encoding then it is
necessary to extract the encoded dex files produced by the modules
themselves. That also required a few changes to tests that did not
previously provide dex files.

Bug: 177892522
Test: m com.android.art
      - check that this change does not change the contents of the apex
        file, i.e. is byte-for-byte identical.
Change-Id: I60996a34d06ed1c87ed244ab3509621999ad86ec
 2021-06-17 10:20:33 +01:00
Martin Stjernholm
59f97a6e34 Merge "Clean up statsd-module-sdk-for-art." am: 2ed110c092 am: 1a3fdba364 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1737040

Change-Id: I8d4b51cf442b26d602c54498102040b00663c89c
 2021-06-17 08:31:36 +00:00
Martin Stjernholm
1a3fdba364 Merge "Clean up statsd-module-sdk-for-art." am: 2ed110c092 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1737040

Change-Id: Id2c956621f3c9dd91bd3ba8a3b58874d0981aeb0
 2021-06-17 08:15:33 +00:00
Martin Stjernholm
2ed110c092 Merge "Clean up statsd-module-sdk-for-art." 2021-06-17 08:04:23 +00:00
Lukacs T. Berki
2063a0d7b8 Make the IsSdkVariant field and method the same. 
Before, the IsSdkVariant() method also checked AlwaysSdk(). Instead,
sdkMutator now sets the IsSdkVariant field to True even for the single
variation it creates when AlwaysSdk is true.

Test: Presubmits.
Change-Id: Ied8b42a3441a30484ef8c5dff5aade5fe92574bb
 2021-06-17 09:32:36 +02:00
Paul Duffin
8e69cba899 Merge "Make apex variants of prebuilt apex exported modules available in make" am: 2c891873d6 am: ea621048f3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738035

Change-Id: I1399ecfd269e68a6d69766cf9cd85294cb376adf
 2021-06-17 07:04:35 +00:00
Paul Duffin
dc998efc9f Merge "Create APEX variant for prebuilt_apex/apex_set" am: 2960e9bdf2 am: 70fc36a6fc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738034

Change-Id: I0cf928c7649040fe588ae8ff9d7db55f4f6c7610
 2021-06-17 07:04:27 +00:00
Jingwen Chen
442b1a4070 Use IsEnvTrue for USE_BAZEL_ANALYSIS check. 
Make this consistent with the check in soong_ui: https://cs.android.com/android/platform/superproject/+/master:build/soong/ui/build/config.go;l=930;drc=0b55bdb7af7ab2a039fefc88086f0ee41c00ac69

Change-Id: I8d57fafa954ce3dd041cc38250819531125d81ac
Test: TH
 2021-06-17 07:02:23 +00:00
Paul Duffin
ea621048f3 Merge "Make apex variants of prebuilt apex exported modules available in make" am: 2c891873d6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738035

Change-Id: If738b8f670d171bdf43844c967f745f20d2bda84
 2021-06-17 06:48:41 +00:00
Paul Duffin
70fc36a6fc Merge "Create APEX variant for prebuilt_apex/apex_set" am: 2960e9bdf2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738034

Change-Id: I1003d7a860691c0d13a31f0b5ac0e6f384989fd5
 2021-06-17 06:47:46 +00:00
Paul Duffin
2c891873d6 Merge "Make apex variants of prebuilt apex exported modules available in make" 2021-06-17 06:36:45 +00:00
Paul Duffin
2960e9bdf2 Merge "Create APEX variant for prebuilt_apex/apex_set" 2021-06-17 06:32:55 +00:00
Treehugger Robot
a8d8c6c904 Merge "Remove jungjw from OWNERS." am: e7cf91bea4 am: f5e6633028 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738713

Change-Id: I97b625276fd3d45704a5b5a8e2191d67dc462632
 2021-06-17 04:24:02 +00:00
Treehugger Robot
f5e6633028 Merge "Remove jungjw from OWNERS." am: e7cf91bea4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738713

Change-Id: Id39a3643de200df1324a5a87589eb069d7e5ce05
 2021-06-17 03:59:06 +00:00
Treehugger Robot
e7cf91bea4 Merge "Remove jungjw from OWNERS." 2021-06-17 03:42:06 +00:00
Jaewoong Jung
dc7a51e600 Remove jungjw from OWNERS. 
Test: None
Change-Id: I8dfc727db02d734f771c012945a694a0ebc72422
 2021-06-16 18:47:09 -07:00
Colin Cross
2613002a07 Merge changes from topic "ndk_libandroid_support_late_static_libs" am: 9fb2d1fb62 am: fe6f1e6fd0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736360

Change-Id: Ic91c7d7085e6eb2f5387c965452afd54fe207323
 2021-06-16 22:21:38 +00:00
Colin Cross
fe6f1e6fd0 Merge changes from topic "ndk_libandroid_support_late_static_libs" am: 9fb2d1fb62 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736360

Change-Id: I5d987d66b27b1d2c434c8e99d91b95e2e50a9c0c
 2021-06-16 22:08:15 +00:00
Colin Cross
9fb2d1fb62 Merge changes from topic "ndk_libandroid_support_late_static_libs" 
* changes:
  Use LateStaticLibs for ndk_libandroid_support
  Move LateStaticLibs after SharedLibs in the dependency include order
  Test include directory ordering
 2021-06-16 21:54:37 +00:00
Paul Duffin
e52b37e049 [automerger skipped] Merge "Dedup apex/Prebuilt and apex/ApexSet" am: 8b8c4f74f3 am: 5d2be4d35f -s ours 
am skip reason: Merged-In I8437af00d6bb7d0d339f25b3b02cd1cf67d6938a with SHA-1 b176d29bd2 is already in history

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

Change-Id: I89a21d7159d0ff46da0c04e6ec929c5834c06b6e
 2021-06-16 20:46:31 +00:00
Paul Duffin
5d2be4d35f Merge "Dedup apex/Prebuilt and apex/ApexSet" am: 8b8c4f74f3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736208

Change-Id: I4424dbf52b561ad32d689f724f25b8f1f0b9c575
 2021-06-16 20:42:57 +00:00
Pirama Arumuga Nainar
84dcdc819e Merge "Revert "Switch to clang-r416183d"" am: 8d24812be7 am: 8f5a60cac9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736920

Change-Id: If04d6fdb4e8bc7b0b9ed3d247c01681e991f8079
 2021-06-16 20:42:44 +00:00
Paul Duffin
8b8c4f74f3 Merge "Dedup apex/Prebuilt and apex/ApexSet" 2021-06-16 20:30:31 +00:00
Pirama Arumuga Nainar
8f5a60cac9 Merge "Revert "Switch to clang-r416183d"" am: 8d24812be7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736920

Change-Id: I693cc0e6127bd96dfa703405c4f62ba51fe08cd5
 2021-06-16 20:21:22 +00:00
Pirama Arumuga Nainar
8d24812be7 Merge "Revert "Switch to clang-r416183d"" 2021-06-16 20:00:18 +00:00
Pirama Arumuga Nainar
e6f19467c1 Revert "Switch to clang-r416183d" 
Revert submission 1737013-switch-to-clang-r416183d

Bug: http://b/191276541
Bug: http://b/189328402

Reason for revert: Breaks renderscript_mac build
Reverted Changes:
I25142ddaa:[scripts/symbol] Switch to clang-r416183d
If11e59638:Switch to clang-r416183d

Change-Id: I9e95b4823f111d4482f9fbb5da48acc62f74cc8c
 2021-06-16 18:26:49 +00:00
Treehugger Robot
bd545b2aca Merge "Switch to clang-r416183d" am: 2f1b9cb86a am: 9bd077aa5e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1737013

Change-Id: I9053c5ebb4761900b007f71740dac36e9cf1b091
 2021-06-16 18:18:55 +00:00
Paul Duffin
a35f8db127 Make apex variants of prebuilt apex exported modules available in make 
Previously, the apex variants of modules exported from prebuilt_apex
and apex_set modules were not exported to make. Neither by the modules
themselves or by the prebuilt apex module. The master-art build relied
on the platform variants of the conscrypt and core-icu4j libraries
being exported to make so that they could be used by vogar.

Unfortunately, a change to export the prebuilt_bootclasspath_fragment
modules that contain the conscrypt and core-icu4j prebuilt libraries
from the corresponding prebuilt_apex prevented the platform variants
of those libraries from being exported at all which broke the
master-art builds as it only has prebuilts of those modules. It did not
break the aosp/master build as that has source modules.

The difference between the two builds is that the apex module type
makes its contents available in make but the prebuilt_apex/apex_set
module types do not.

This change causes the prebuilt_apex/apex_set module types to behave
more like the apex module type by making its exported libraries
available in make.

Test: m droid
      - in aosp/master
      art/tools/buildbot-build.sh --target --installclean
      - in master-art and aosp/master
Change-Id: I57537d17d4920d37d896ed491c6aaa15302cb25d
 2021-06-16 19:02:58 +01:00
Treehugger Robot
9bd077aa5e Merge "Switch to clang-r416183d" am: 2f1b9cb86a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1737013

Change-Id: Idf0e9977f907f7623654bf598b7394c7baefff81
 2021-06-16 18:00:27 +00:00
Paul Duffin
6717d88f46 Create APEX variant for prebuilt_apex/apex_set 
Previously, the prebuilt_apex/apex_set did not have an apex specific
variant created which meant that they depended upon the platform
variant of the modules it depended upon. This change creates an
apex variant for them just as is done for the apex module type which
causes it to depend upon the apex specific variant of the modules it
depends upon.

Test: m droid
Bug: 179354495
Change-Id: I7d6f3609c267b3e90b90b9befe7d76f351a0c2bd
 2021-06-16 18:54:19 +01:00
Treehugger Robot
2f1b9cb86a Merge "Switch to clang-r416183d" 2021-06-16 17:46:24 +00:00
Colin Cross
cc351c4b48 Merge "Use a linker script for host bionic embedded linker sections" am: 956e32c1be am: ca1129695e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1735344

Change-Id: I7d03c244965df18361a93ba37b81bd1ab7106849
 2021-06-16 17:18:30 +00:00
Colin Cross
e32bfdbbf4 Merge changes Ie384089d,Ie2e954cd am: baf4f0c30a am: d701a34838 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1735343

Change-Id: I8e9df129e07529835e47475e8683447fc5d6dd51
 2021-06-16 17:18:24 +00:00
Colin Cross
afcfcfbffb Merge changes from topic "host_bionic_no_inject" am: f77d3804fc am: 75decc4e97 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1735341

Change-Id: I1d89f832f1b6dc080351cd780eeedfef68fff4cd
 2021-06-16 17:17:39 +00:00
Colin Cross
4f184811cc Stop injecting symbols into host bionic binaries am: f04eb99acc am: dc6e968a3f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1735453

Change-Id: Ic03ee4f716e558af4d9d3d5223ae4385eb6627bb
 2021-06-16 17:17:33 +00:00
Colin Cross
ca1129695e Merge "Use a linker script for host bionic embedded linker sections" am: 956e32c1be 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1735344

Change-Id: I3f6af1b09775859aa40ffae64fe477fb33845310
 2021-06-16 17:05:28 +00:00
Colin Cross
d701a34838 Merge changes Ie384089d,Ie2e954cd am: baf4f0c30a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1735343

Change-Id: Ibf8b37498aab5fe24fb5845072874dd396c18667
 2021-06-16 17:05:13 +00:00
Colin Cross
75decc4e97 Merge changes from topic "host_bionic_no_inject" am: f77d3804fc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1735341

Change-Id: Ie55dfa7dacf0d27e2dd2a6916c60211c5fb02344
 2021-06-16 17:05:01 +00:00