Commit Graph

36533 Commits

Author SHA1 Message Date
Paul Duffin
9ef1a9fc36 Perform hidden API encoding in bootclasspath_fragment am: 54c98f5b4a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1710512

Change-Id: I3713fecbb13690303dc7b68ad838985d09091536
2021-05-23 15:31:44 +00:00
Paul Duffin
8c96177595 Refactor hiddenAPIEncodeDex for use by bootclasspath_fragment am: 0916595b1c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1710511

Change-Id: Iaf4d6c9cb9e24f060c663c62840a0d504149400b
2021-05-23 15:30:58 +00:00
Paul Duffin
54c98f5b4a Perform hidden API encoding in bootclasspath_fragment
Previously, the apex content info was populated with hidden API encoded
dex jars retrieved directly from the java module. This change retrieves
the unencoded dex jars from the java module, encodes them and then
stores the result in the apex content info.

Bug: 179354495
Test: m com.android.art com.android.ipsec com.android.os.statsd com.android.conscrypt
      - verify that this does not change the contents of the apex files
Change-Id: Ib1b6eb8b62ac50e03b9e0d07c877ca70bb6f6d25
2021-05-23 11:21:38 +01:00
Paul Duffin
0916595b1c Refactor hiddenAPIEncodeDex for use by bootclasspath_fragment
Previously, if the method was called multiple times by the same module
the resulting build rules would all use the same temporary directory
which meant that if run in parallel they would conflict with each
other. This change fixes that by providing a jar specific temporary
directory so it can be used by bootclasspath_fragment to encode its
content modules.

Also, cleans up, simplifies and improves the documentation.

Bug: 179354495
Test: m com.android.art com.android.ipsec com.android.os.statsd com.android.conscrypt
      - verify that this does not change the contents of the apex files
Change-Id: I0ebe61abc8e16111c6e8a822eb96c57846b98461
2021-05-23 11:21:38 +01:00
Martin Stjernholm
029005ee20 Merge "Fix indexing bug when config.Arches() returns an empty array." am: 22053dcbf2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1716108

Change-Id: I7f406fafb6084fba9d0a609f9168faf2d8c7966b
2021-05-22 19:08:56 +00:00
Christopher Parsons
5166c5a9b3 Merge "Propagate unexported deps via implementation_deps" am: dbfafc0a3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1711041

Change-Id: I1d038ba1ce04ac22bc35a2cf16a6f10159c2b5f0
2021-05-22 19:08:09 +00:00
Martin Stjernholm
22053dcbf2 Merge "Fix indexing bug when config.Arches() returns an empty array." 2021-05-22 18:53:42 +00:00
Christopher Parsons
dbfafc0a3c Merge "Propagate unexported deps via implementation_deps" 2021-05-21 21:29:59 +00:00
Pirama Arumuga Nainar
dfee0cc854 Merge "[cc/coverage] Define a macro during coverage builds" am: cb56f0166f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1689270

Change-Id: I6025724bc9559d0b9a754ebf316deef8e42b13dd
2021-05-21 21:02:45 +00:00
Pirama Arumuga Nainar
cb56f0166f Merge "[cc/coverage] Define a macro during coverage builds" 2021-05-21 20:47:00 +00:00
Martin Stjernholm
df298b3bed Fix indexing bug when config.Arches() returns an empty array.
This happens when com.android.art.host is not disabled in
prebuilts/build-tools/build-prebuilts.sh.

Test: m nothing
Test: env OUT_DIR=out prebuilts/build-tools/build-prebuilts.sh
  on the aosp-build-tools branch
Bug: 188922057
Change-Id: Ib21d17bb627e4cf7faee320febe65e1bb4566d4e
2021-05-21 21:07:26 +01:00
Spandan Das
dac1f37f8d Merge "Adding relative_install_path field to android_app_import" am: fc1fbc428a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1710950

Change-Id: If69c45fd297c832c7ae057119c042ccdbd2f4925
2021-05-21 16:37:22 +00:00
Spandan Das
fc1fbc428a Merge "Adding relative_install_path field to android_app_import" 2021-05-21 16:15:38 +00:00
Colin Cross
6e87729c10 Merge "Allow missing java_sdk_library files in AllowMissingDependencies builds" am: 90463fe8cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1714750

Change-Id: I1140332f8e45a4cf1e5cf04fa60b435b85e98123
2021-05-21 15:27:12 +00:00
Colin Cross
90463fe8cb Merge "Allow missing java_sdk_library files in AllowMissingDependencies builds" 2021-05-21 15:07:49 +00:00
satayev
47d1a806a3 Merge "Populate individual classpath_fragments' classpaths.proto configs." am: a4cf238f4d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699194

Change-Id: Ib9e666a0d5583b75f9c65c4a297a0b95299af6c4
2021-05-21 10:47:20 +00:00
satayev
a4cf238f4d Merge "Populate individual classpath_fragments' classpaths.proto configs." 2021-05-21 10:21:49 +00:00
Jingwen Chen
9a8576be51 Merge "bp2build: generate arm toolchain flags into @soong_injection." am: 857d037566
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1714248

Change-Id: I922954a71f313ef99449d6492d1ed4146e4ea94f
2021-05-21 04:31:19 +00:00
Jingwen Chen
58a65e5418 Add a comment to absolutePath on why it's not exported. am: 78257e5b6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1713735

Change-Id: I5a27edb4b77442d64cc33d2bff46d958ff8416a1
2021-05-21 04:30:24 +00:00
Jingwen Chen
857d037566 Merge "bp2build: generate arm toolchain flags into @soong_injection." 2021-05-21 04:14:51 +00:00
Jingwen Chen
78257e5b6b Add a comment to absolutePath on why it's not exported.
Change-Id: Ib6595e8af3d845861d4c5988750e3c43280bb697
Test: TH
2021-05-21 02:37:00 +00:00
Bill Peckham
fa8f685b4d Merge changes from topic "far-dep-exists" am: 79610d55fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1714569

Change-Id: I10c7a86a27a11a16bb63825059856f9286cb3492
2021-05-21 02:01:42 +00:00
Martin Stjernholm
a44c9d2625 Plumb through OtherModuleFarDependencyVariantExists from blueprint. am: 408ffd8cca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1697061

Change-Id: I4ef78cd1d954c20e78136288d10c4f437f0b3570
2021-05-21 02:01:14 +00:00
Bill Peckham
79610d55fa Merge changes from topic "far-dep-exists"
* changes:
  Check for product variant in addition to core variant.
  Plumb through OtherModuleFarDependencyVariantExists from blueprint.
2021-05-21 01:37:21 +00:00
Brian Egizi
777ab7c148 Fix unbound variable in kzip script am: 2aded7dd55
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1714571

Change-Id: Id53dfbf5f224aa60c758e944df32f6d45478b7a2
2021-05-21 01:20:40 +00:00
Colin Cross
18f840c45e Allow missing java_sdk_library files in AllowMissingDependencies builds
java_sdk_library modules in builds with AllowMissingDependencies may
be missing defaults modules that cause them to look for api files that
they normally wouldn't need.  Move the error to runtime so it doesn't
block the build unless the branch tries to build that module.

Test: prebuilts/build-tools/build-prebuilts.sh in aosp-build-tools
Change-Id: I279b0cd8493779f972c0ac02235967c10b35a5a0
2021-05-20 18:00:37 -07:00
Brian Egizi
e5731afd36 Merge "Update kzip script to support superproject revision environment variable" am: c3a800f611
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1710108

Change-Id: I942eb3d57f3fd9f3e9cb9aa0094bcbb8f49e193e
2021-05-21 00:56:49 +00:00
Brian Egizi
2aded7dd55 Fix unbound variable in kzip script
Change-Id: Id7f81677389cb853da064a43f1d5d54b2271f0c0
2021-05-21 00:51:44 +00:00
Brian Egizi
c3a800f611 Merge "Update kzip script to support superproject revision environment variable" 2021-05-21 00:20:52 +00:00
Spandan Das
d1fac64807 Adding relative_install_path field to android_app_import
Test: Ran go test ./java from build/soong
Bug: 149873762
Change-Id: I4abc1fb9e2386c7319b446b84aebaabacc882fd6
2021-05-20 23:10:26 +00:00
Jingwen Chen
51a1e1cf59 bp2build: generate arm toolchain flags into @soong_injection.
Other architectures will come later.

Bug: 187084665
Test: TH
Change-Id: Ifcc6773625e56b1fc20260d840380e7ee4ecee7f
2021-05-20 22:29:39 +00:00
Bill Peckham
06123b76d2 Merge "VNDK snapshot may provide LLNDK stub libraries" am: 1d3466a019
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1710768

Change-Id: I5b1c17fb2d1d8cc4b3b1674caef579ed7811860f
2021-05-20 22:02:10 +00:00
Bill Peckham
1d3466a019 Merge "VNDK snapshot may provide LLNDK stub libraries" 2021-05-20 21:43:44 +00:00
Brian Egizi
4aa056eb9e Update kzip script to support superproject revision environment variable
This changes the superproject sha variable to use the
SUPERPROJECT_REVISION as the default value if no explicit sha is
defined. Only sets up the new default if the revision value matches a
sha.

This change is required since the builder provides a revision for the
superproject that is either pinned to a sha or a branch name. If it is
pinned to a sha, we want to use this as the fallback source for
SUPERPROJECT_SHA

Bug: b/149248752
Change-Id: I59569b0e4d2f360243f0adc5b2587130956b6b99
2021-05-20 19:36:13 +00:00
satayev
8fab6f86af Populate individual classpath_fragments' classpaths.proto configs.
To avoid duplicates on *CLASSPATH environ variables at runtime, remove
split entries from platform-*classpath, i.e. all updatable jars that
have their own classpath fragments should not appear in the
platform-*classpath's classpaths.proto config.

Bug: 180105615
Test: m && launch_cvd; atest CtsClasspathsTestCases
Change-Id: Id2759ab8e106cc183e695bf3509a6ab60ab0ef2a
Merged-In: Id2759ab8e106cc183e695bf3509a6ab60ab0ef2a
2021-05-20 20:06:03 +01:00
Bill Peckham
4016d7b53e Check for product variant in addition to core variant.
It's possible that a module will have a product variant
but not a core variant. In that case, we still need to
apply the vendor suffix to the androidmk module name.

Bug: 188720375
Bug: 187963715
Test: Build vendor image using vendor snapshot.

Change-Id: I190fdd707ca23357d1c324c1b1f3318457625f03
2021-05-20 18:57:04 +00:00
Martin Stjernholm
8e40981807 Merge "Skip TestDex2oatToolDeps on Darwin." am: ecf2dc4614
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1713990

Change-Id: I9dc64f7aa5d1f8d271646569251ea59ec79f6741
2021-05-20 17:12:11 +00:00
Martin Stjernholm
ecf2dc4614 Merge "Skip TestDex2oatToolDeps on Darwin." 2021-05-20 16:52:30 +00:00
Martin Stjernholm
408ffd8cca Plumb through OtherModuleFarDependencyVariantExists from blueprint.
Test: m nothing
Bug: 188398129
Change-Id: I64147293b6c51b437219e76e9e372fe56b977722
2021-05-20 16:43:04 +00:00
Chris Parsons
d6358775c8 Propagate unexported deps via implementation_deps
Test: bp2build and mixed_libc CI
Test: Manually verified that libc_bionic_ndk compilation gets the
appropriate headers (and no extra headers) from downstream

Change-Id: I79eb6e8ec1d415bd50d12105da4cf97101f95474
2021-05-20 12:05:24 -04:00
Martin Stjernholm
1b784a7caa Skip TestDex2oatToolDeps on Darwin.
This fixes https://r.android.com/1711292.

Test: m nothing
Bug: 188647117
Bug: 145934348
Bug: 172480615
Change-Id: I0c80b546a814d799562f374148eae5ca23b0e1f8
2021-05-20 15:53:00 +01:00
Liz Kammer
95f87cd34e Merge "Dump bazel product config in Soong" am: 50d601731b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1708967

Change-Id: I934914e29a945fd3ee2e0b090f1041d9a4d972b9
2021-05-20 14:20:57 +00:00
Liz Kammer
50d601731b Merge "Dump bazel product config in Soong" 2021-05-20 14:09:18 +00:00
Jingwen Chen
862165b7fa Merge "Add libc_nomalloc to mixed builds denylist." am: 2fad43685e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1714068

Change-Id: Ia937ed221fec8fd389af32e9a43c0aa7cc4221f8
2021-05-20 13:57:41 +00:00
Jingwen Chen
2fad43685e Merge "Add libc_nomalloc to mixed builds denylist." 2021-05-20 13:40:49 +00:00
Paul Duffin
02d4f36f2c Merge "Store dex jar paths in bootclasspath_fragment's apex content info" am: bf4e6ec8a7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1710510

Change-Id: I02ba146397786a66977c2412ddce2a5c98fd82d5
2021-05-20 13:03:06 +00:00
Paul Duffin
c00efb9f2c Merge "Move hidden API encoding after resource merging" am: 94e594c799
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1710509

Change-Id: I6f847bcbd5ac0a92f92c0306cb112a2b992d0b5c
2021-05-20 13:02:23 +00:00
Paul Duffin
bf4e6ec8a7 Merge "Store dex jar paths in bootclasspath_fragment's apex content info" 2021-05-20 12:46:48 +00:00
Paul Duffin
94e594c799 Merge "Move hidden API encoding after resource merging" 2021-05-20 12:45:42 +00:00
Justin Yun
dee806fd09 VNDK snapshot may provide LLNDK stub libraries
VNDK snapshots newer than v30 have LLNDK stub libraries. In that
case, the vendor variant for the BOARD_VNDK_VERSION must not be
generated from the LLNDK modules. They are already provided by the
VNDK snapshots.
Generate the vendor variant of the BOARD_VNDK_VERSION only if
BOARD_VNDK_VERSION has an integer value less than or equal to 30.

Bug: 187963715
Bug: 181815415
Test: m nothing
Change-Id: I31e90f4d7e7678c45558f6bf987f5582a4c34f78
2021-05-20 21:05:19 +09:00