Commit Graph

43437 Commits

Author SHA1 Message Date
satayev
cbe33a0233 Merge "Add classpath fragment property to skip proto generation." am: f45966f35b am: 6ea9e45d9c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738336

Change-Id: I8382015b96a37117e62735a6d5a682c3645c397f
2021-06-18 10:45:32 +00:00
satayev
6ea9e45d9c Merge "Add classpath fragment property to skip proto generation." am: f45966f35b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1738336

Change-Id: I153af3111b835ce3bbfb56b9d91cf43269285ee4
2021-06-18 10:29:26 +00:00
satayev
f45966f35b Merge "Add classpath fragment property to skip proto generation." 2021-06-18 10:17:50 +00:00
Paul Duffin
3d052d1495 Export boot image files from prebuilt_apex/apex_set am: 5466a3699c am: c4a3e6d2f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736777

Change-Id: I45874db42b8d17e0893d5e1c4b9aca6356066221
2021-06-18 07:05:13 +00:00
Paul Duffin
e59c339a43 Copy boot dex jars from prebuilt art-bootclasspath-fragment if preferred am: ce918b0278 am: 56a6834640
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736226

Change-Id: I33abc58165d9ae42f5d567f7c77de5a9fe4bb187
2021-06-18 07:05:07 +00:00
Paul Duffin
c4a3e6d2f3 Export boot image files from prebuilt_apex/apex_set am: 5466a3699c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736777

Change-Id: I1cf84ff519ca6865d3a87ae75b1f48fc6ed1e3f4
2021-06-18 06:48:21 +00:00
Paul Duffin
56a6834640 Copy boot dex jars from prebuilt art-bootclasspath-fragment if preferred am: ce918b0278
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736226

Change-Id: I116ef8467e180b691ba6e6f2bcf38cd275f6ecba
2021-06-18 06:47:41 +00:00
Xin Li
b38c8ac34d [automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: ea50a05063 -s ours
am skip reason: Merged-In I33b074204ffba5aa2bf83bbbe350d744ee9d8c57 with SHA-1 007875cd10 is already in history

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

Change-Id: Ia71a74f8fb68d6395cdd7e84deab876011a89a3b
2021-06-18 06:18:43 +00:00
Xin Li
ea50a05063 DO NOT MERGE - Mark RQ3A.210410.001 as merged
Bug: 190855093
Merged-In: I33b074204ffba5aa2bf83bbbe350d744ee9d8c57
Change-Id: I50911f727ba98df1035500dbbf467b849be8d6c2
2021-06-17 22:43:25 -07:00
TreeHugger Robot
251c197578 [automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master am: aee99b3a13 -s ours
am skip reason: Merged-In I0f5da13644fd2ec7b0472fe82918e3c6a72d953c with SHA-1 c2b6b65d73 is already in history

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

Change-Id: I17ca25defec9494f56e6f245ee1879d9ddc4b2cf
2021-06-18 00:51:56 +00:00
TreeHugger Robot
aee99b3a13 Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master 2021-06-18 00:30:18 +00:00
Pirama Arumuga Nainar
6f901fa4f4 Merge changes from topic "libbinder.stable.abi" into sc-dev am: 95a4bedc68
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15003839

Change-Id: I0fd9c68aa671abe7a8d2e4bb2c707247c9ae314d
2021-06-17 23:03:37 +00:00
Pirama Arumuga Nainar
e5295c7896 [automerger skipped] Disable TestCcLibraryBp2Build in sc-dev am: 12066c6542 -s ours
am skip reason: Merged-In I47e7afeaee3c9124f4231bf0eece7b6844b5313d with SHA-1 250c5217a2 is already in history

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

Change-Id: I44293f7c35ea8c30a689b368230c17c6f58709ab
2021-06-17 23:03:36 +00:00
Pirama Arumuga Nainar
95a4bedc68 Merge changes from topic "libbinder.stable.abi" into sc-dev
* changes:
  [cc/pgo] Mark pgo.sampling property as an arch-variant
  Disable TestCcLibraryBp2Build in sc-dev
  Mark more fields in BaseLinkerProperties as arch variant
2021-06-17 22:49:35 +00:00
Paul Duffin
5466a3699c Export boot image files from prebuilt_apex/apex_set
Previously, the prebuilt art-bootclasspath-fragment did not provide any
boot image files. That meant it was impossible to build any module that
requires access to those files from prebuilts, e.g. any module that
needs to be dexpreopt-ed.

This change enables that module to retrieve those files from the
prebuilt_apex.

Bug: 177892522
Bug: 189298093
Test: m nothing
      m droid SOONG_CONFIG_art_module_source_build=false SKIP_BOOT_JARS_CHECK=true
      - the previous command does not work but this change does fix one
        of the issues reported.
Change-Id: I1d4d9545172d79282918130df6b9aa55471bffc1
2021-06-17 23:05:43 +01:00
Paul Duffin
ce918b0278 Copy boot dex jars from prebuilt art-bootclasspath-fragment if preferred
Previously, the boot dex jars were only copied to the predefined
locations used by the build from the source art-bootclasspath-fragment
if it was preferred, otherwise no files were copied. That caused build
failures when attempting to build with ART prebuilts. This change
copies the files from prebuilts too.

Bug: 177892522
Bug: 189298093
Test: m nothing
      m droid SOONG_CONFIG_art_module_source_build=false SKIP_BOOT_JARS_CHECK=true
      - the previous command does not work but this change does fix one
        of the issues reported.
Change-Id: I35b37355170546daf6ecac2134d1ca9a73d0e3bc
2021-06-17 23:05:43 +01:00
Xin Li
007875cd10 DO NOT MERGE - Merge ab/7272582
Bug: 190855093
Merged-In: I0f5da13644fd2ec7b0472fe82918e3c6a72d953c
Change-Id: I33b074204ffba5aa2bf83bbbe350d744ee9d8c57
2021-06-17 21:41:17 +00:00
Paul Duffin
33ddfdf42b Merge "Copy implementation and header jars to make when possible" am: 94b2e705d1 am: d11c1c8fa4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1740074

Change-Id: I83a02203cbebd6dff91a06a7969615fbdfd01390
2021-06-17 21:37:45 +00:00
Paul Duffin
e50050657d Exclude jacocoagent from boot jars package check am: 7f8721618c am: eaae506467
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1739993

Change-Id: I9ad0a03bc1c2922ee2e4bad2a654b83b6fed6bbd
2021-06-17 21:37:36 +00:00
Paul Duffin
d11c1c8fa4 Merge "Copy implementation and header jars to make when possible" am: 94b2e705d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1740074

Change-Id: I5faab59bcde87b6be2e1b21ec9e85bdd75a5f687
2021-06-17 20:46:57 +00:00
Paul Duffin
eaae506467 Exclude jacocoagent from boot jars package check am: 7f8721618c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1739993

Change-Id: I83ba8899b202dd89ee613543eead69ab1f88ac4c
2021-06-17 20:37:45 +00:00
Paul Duffin
94b2e705d1 Merge "Copy implementation and header jars to make when possible" 2021-06-17 20:34:49 +00:00
Paul Duffin
85fa344d09 Copy implementation and header jars to make when possible
Fixes test issues caused by a jar containing a classes.dex file was
copied to a place that was expected a jar containing class files.

Bug: 191360201
Test: - in master-art
      find out/ -name \*core-icu4j\* | xargs rm -fr
      art/tools/buildbot-build.sh --target --installclean
      art/tools/bootjars.sh --path --core
      - examine file output from previous script for core-icu4j,
        before this change it contained classes.dex file after this
        change it contained *.class files.
Change-Id: I05ecf652535ec097125fb76d6ca80fee6587f98d
2021-06-17 20:33:54 +01:00
Paul Duffin
7f8721618c Exclude jacocoagent from boot jars package check
This replicates the previous behavior when the boot jars package check
was performed by a singleton. When the singleton was removed and the
check was performed by the platform-bootclasspath the logic to exclude
jacocoagent from the list was lost. This change replaces it.

Bug: 191377804
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true check-boot-jars
      - fails without this change passes with this change.
Change-Id: If9eae254045bef9a0c0963213721fc12a9f463cb
2021-06-17 19:33:24 +01:00
Paul Duffin
d69575cd8c Merge "Move boot jars package check into platform_bootclasspath" am: 4aea00ec18 am: 55e9321255
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1737753

Change-Id: If40ca43057eac8569d1e69fa0e64b334507f9d38
2021-06-17 16:37:01 +00:00
Paul Duffin
0a212b3dd5 Merge "Cleanup bootclasspathFragmentInitContentsFromImage" am: 909a2fd055 am: 57f3d6c870
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1737754

Change-Id: I3ffe996a766ff50a938486a425aef4f293467685
2021-06-17 16:36:53 +00:00
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
55e9321255 Merge "Move boot jars package check into platform_bootclasspath" am: 4aea00ec18
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1737753

Change-Id: I4d85e0f1abac976520b0127f314566348fbc33ee
2021-06-17 16:23:08 +00:00
Paul Duffin
57f3d6c870 Merge "Cleanup bootclasspathFragmentInitContentsFromImage" am: 909a2fd055
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1737754

Change-Id: Id717912bdc2b89154ab8a2a44d1e15b26010f6ee
2021-06-17 16:22:59 +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
4aea00ec18 Merge "Move boot jars package check into platform_bootclasspath" 2021-06-17 16:06:51 +00:00
Paul Duffin
909a2fd055 Merge "Cleanup bootclasspathFragmentInitContentsFromImage" 2021-06-17 16:03:51 +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
satayev
b98371cc13 Add classpath fragment property to skip proto generation.
This must always be true for updatable apexes, but is not necessary
for non-updatable apexes like com.android.i18n.

In a follow up this will be used to figure out whether apex boot jars
should be bundled into platform_bootclasspath.

Bug: 191127295
Test: atest CtsClasspathsTestCases derive_classpath_test
Change-Id: Ib7dc5b057cb24955222fb97f3ff9da079f30ed77
2021-06-17 12:59:33 +01: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
c8ead41ba9 Move boot jars package check into platform_bootclasspath
Bug: 177892522
Bug: 189298093
Test: m check-boot-jars
      m SOONG_CONFIG_art_module_source_build=false check-boot-jars
      - Ran both commands with and without java.lang in the
        package_allowed_list.txt
Change-Id: Iba1a881c8f6b6919d5c0c0520eb3073658f3b8d2
2021-06-17 10:54:27 +01:00
Paul Duffin
58e7586b3d Cleanup bootclasspathFragmentInitContentsFromImage
Removes some unnecessary logic left over from previous changes.

Bug: 177892522
Test: m nothing
Change-Id: Id11e2ea8a647283af1b152b33757132e44dcd6c3
2021-06-17 10:54:27 +01: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