Commit graph

32167 commits

Author SHA1 Message Date
Orion Hodson
4bc549e36b Merge "apex/allowed_deps: add libnetjniutils" am: c7dff7f142
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1519660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab04d521d8d49fb6780e3f23206819cc2c8a504d
2020-12-15 06:45:35 +00:00
Orion Hodson
c7dff7f142 Merge "apex/allowed_deps: add libnetjniutils" 2020-12-15 06:25:38 +00:00
Treehugger Robot
af5e9d7488 Merge "Enable bazel profiling in soong_build." am: 9d836102ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1526317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib93b47c15f0f047c6072c8ddba642627c5e102e8
2020-12-15 00:35:18 +00:00
Treehugger Robot
9d836102ad Merge "Enable bazel profiling in soong_build." 2020-12-15 00:17:09 +00:00
Ulyana Trafimovich
05101cb1a6 Merge "Add MissingUsesLibraries to Soong vars for scripts that use --skip-make." am: 7f487d4a86
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1523061

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I103bace94e96971c81ef03d2ea9fb12c984bea1a
2020-12-14 22:51:59 +00:00
Ulyana Trafimovich
7f487d4a86 Merge "Add MissingUsesLibraries to Soong vars for scripts that use --skip-make." 2020-12-14 22:44:17 +00:00
Martin Stjernholm
3b8eed4cec Merge "Stopgap fix to avoid aapt2 build errors." am: 0523bd6024
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1528149

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I971b0bb3ddd32e7a58360abf63b6ca3536af68ad
2020-12-14 22:23:12 +00:00
Martin Stjernholm
0523bd6024 Merge "Stopgap fix to avoid aapt2 build errors." 2020-12-14 20:59:02 +00:00
Treehugger Robot
e636d61bb1 Merge "Add android.hardware.memtrack-unstable-ndk_platform" am: 1e14bed0c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1522521

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9aab23efdd01303d0dc8c34e4a50ae31ce2e3548
2020-12-14 19:29:18 +00:00
Yan Yan
22d8148922 Merge "Allow IPsec module to depend on modules-utils-build" am: 1df80f2951
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1521880

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d4afe025440a2d65a835bfc34dec62f9b2aabd6
2020-12-14 19:28:27 +00:00
Patrice Arruda
05ab2d0731 Enable bazel profiling in soong_build.
Bazel is executed several times during the execution of soong_build.
For each bazel execution, generate a profile and save under the
BAZEL_METRICS_DIR which is defined in soong_ui.

Bug: b/174479924
Test: * USE_BAZEL_ANALYSIS=1 USE_BAZEL=1 m nothing and checked
        if the cquery and graph build bazel profiles were generated.
      * Verified that the generated bazel profiles were uploaded
        to the local dev metrics pipeline.

Change-Id: I3d20204484dc6c5a1525a5d3eec1d62cfb33535b
2020-12-14 18:48:11 +00:00
Treehugger Robot
1e14bed0c6 Merge "Add android.hardware.memtrack-unstable-ndk_platform" 2020-12-14 18:36:10 +00:00
Yan Yan
1df80f2951 Merge "Allow IPsec module to depend on modules-utils-build" 2020-12-14 18:33:50 +00:00
Martin Stjernholm
6f8fecd2e3 Stopgap fix to avoid aapt2 build errors.
Should fix build errors on mainline_modules on aosp-master. This script
still does not propagate all options to aapt2 correctly, but that will
be fixed by removing the script altogether (b/174315599).

Test: build/soong/scripts/build-aml-prebuilts.sh art-module-sdk \
      art-module-test-exports conscrypt-module-host-exports \
      conscrypt-module-sdk conscrypt-module-test-exports \
      i18n-module-host-exports i18n-module-sdk \
      i18n-module-test-exports platform-mainline-sdk \
      platform-mainline-test-exports runtime-module-host-exports \
      runtime-module-sdk
  (the failing command in
  build/soong/scripts/build-mainline-modules.sh)
Bug: 175386777
Change-Id: I81aa20b1abd177f0d2886ab9b04831437da72f2a
2020-12-14 15:12:23 +00:00
Ulya Trafimovich
37eb6c9448 Add MissingUsesLibraries to Soong vars for scripts that use --skip-make.
In platform builds missing libraries are defined with make variable
INTERNAL_PLATFORM_MISSING_USES_LIBRARIES via soong_config.mk. When Soong
is invoked with "--skip-make" parameter,
INTERNAL_PLATFORM_MISSING_USES_LIBRARIES is not picked up. As a result
the build fails because of missing dependencies.

This CL uses get_build_var to get the value of
INTERNAL_PLATFORM_MISSING_USES_LIBRARIES, then converts it to JSON list.

In the future would be better to migrate both scripts to use --skip-kati
introduced in https://r.android.com/1512613.

Bug: 175286760
Bug: 132357300
Test: forrest build for target "ndk" branch "aosp-master".
Test: Patch build-aml-prebuilts.sh and build-ndk-prebuilts.sh to dump
  their soong.variables config, observe that MissingUsesLibraries is
  coherent with INTERNAL_PLATFORM_MISSING_USES_LIBRARIES. Start running
  each script and observe that they don't fail early due to missing
  dependencies.
Change-Id: I5dbc1d3ea7a64de1e8be6332003acc940c2e6a76
2020-12-14 15:03:40 +00:00
Paul Duffin
3645404e1c Merge changes Iaca95efc,I7ccd5581 am: 57fab96e01
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1526698

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16c80afa62210ad93b2f043812f689c082ba2488
2020-12-14 11:06:31 +00:00
Paul Duffin
57fab96e01 Merge changes Iaca95efc,I7ccd5581
* changes:
  Add RemoveOptionalPrebuiltPrefix() helper function
  Delegate work of apexInfoMutator to ApexInfoMutator interface
2020-12-14 10:54:21 +00:00
Martin Stjernholm
ebc423441c Merge "Add i18n-module-host-exports to the SDK list." am: 2e963cf0d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1526700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ce6bd517c2ad09279b949e69740419c3e790ac8
2020-12-14 10:27:00 +00:00
Martin Stjernholm
2e963cf0d9 Merge "Add i18n-module-host-exports to the SDK list." 2020-12-14 10:12:25 +00:00
Treehugger Robot
d8e90b35dd Merge "Add dependency to list of asset files" am: 9ae3c52b20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1494657

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d89378524abb5fb1202126df0fa21210127f599
2020-12-12 02:14:04 +00:00
Treehugger Robot
9ae3c52b20 Merge "Add dependency to list of asset files" 2020-12-12 01:48:52 +00:00
Treehugger Robot
572056d685 Merge "Move keymint to android.hardware.security." am: f876a3866a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1525191

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ab685dbe1814d59e2edbbe8f5c4ece1bcfd8cb4
2020-12-12 00:26:11 +00:00
Treehugger Robot
f876a3866a Merge "Move keymint to android.hardware.security." 2020-12-12 00:14:21 +00:00
Sophie Zheng
f0fa9dfdd7 Merge "Automate NDK API coverage used by Mainline modules build integration" am: e3a2bdf2c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1516605

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48499cf3594eb7f5b324e8efb092a0ad326027f7
2020-12-11 22:40:00 +00:00
Sophie Zheng
e3a2bdf2c8 Merge "Automate NDK API coverage used by Mainline modules build integration" 2020-12-11 22:19:00 +00:00
Shawn Willden
7831d3eb42 Move keymint to android.hardware.security.
Bug: 175345910
Bug: 171429297
Test: Build
Change-Id: I219fd6c976cf6b624dcf0ae234f66e27ff251cd0
2020-12-11 20:37:03 +00:00
Colin Cross
c20dc8533e Add dependency to list of asset files
We had a dependency on each file in the asset directories, but that
wouldn't cause aapt2 to run if a file was removed.  Add a dependency
on a file that contains the list of files in the asset directories.

Fixes: 172867096
Test: m CarrierConfig && rm packages/apps/CarrierConfig/assets/carrier_config_no_sim.xml && m CarrierConfig
Change-Id: I35f3b85355fa890a3e95eaa6458a21466b6930e4
2020-12-11 19:54:16 +00:00
Ivan Lozano
bef8ffa8e4 Merge "Rust: WriteFileRule instead of printf for protos" am: 30530a9e34
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1514991

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05d791a0e87eb93114ae8eeaa8d122678a114fa7
2020-12-11 19:45:31 +00:00
Martin Stjernholm
4c13f58729 Add i18n-module-host-exports to the SDK list.
Necessary only when platform start using i18n prebuilts, but this helps
CI testing.

Test: build/soong/scripts/build-mainline-modules.sh
Bug: 172480615
Change-Id: Ic24f934ad0b4b7ac7c38d791f80df33315b936e9
2020-12-11 19:20:47 +00:00
Ivan Lozano
30530a9e34 Merge "Rust: WriteFileRule instead of printf for protos" 2020-12-11 19:14:29 +00:00
Pirama Arumuga Nainar
bc7aa97fed Merge "[coverage] Wrap calls to open" am: d36c83862f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1524347

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief1ce6d0014e22aeb39b33d841bb758bd72dd70a
2020-12-11 18:20:19 +00:00
Paul Duffin
d23c726b36 Add RemoveOptionalPrebuiltPrefix() helper function
Test: m nothing
Bug: 171061220
Change-Id: Iaca95efcaf3f02e066751c6e988d609ac40e048a
2020-12-11 18:13:08 +00:00
Pirama Arumuga Nainar
d36c83862f Merge "[coverage] Wrap calls to open" 2020-12-11 17:42:09 +00:00
Treehugger Robot
9dbf21657c Merge "Add PackageFile and use it for prebuilt build tools" am: f4b00aed6e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1515405

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4c25bc8f8f83dd9a7c9d66a5c6879daaf66a392
2020-12-11 16:13:32 +00:00
Paul Duffin
a7d6a89774 Delegate work of apexInfoMutator to ApexInfoMutator interface
Refactor the apexInfoMutator to delegate the work to an implementation
of ApexInfoMutator and then move the existing functionality into the
apexBundle.ApexInfoMutator(). This will allow a follow up change to
customize the behavior of this mutator for prebuilt_apex modules.

Test: m nothing
Bug: 171061220
Change-Id: I7ccd55818e02a606c5494e215f4370b635ddd0a5
2020-12-11 16:07:17 +00:00
Treehugger Robot
f4b00aed6e Merge "Add PackageFile and use it for prebuilt build tools" 2020-12-11 15:42:50 +00:00
Ivan Lozano
839c92a009 Merge "Rust: Vendor support for Rust static libraries." am: 90f5c1d5d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1512674

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0629ac828716edfa16c29321cb4545382bd937c
2020-12-11 14:03:45 +00:00
Ivan Lozano
f0da84ce8e Merge "Refactor for preliminary Rust vendor image support" am: f48c89cd39
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1515798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9adbb2de42979541340c995fa527b4f103a5e111
2020-12-11 14:03:02 +00:00
Ivan Lozano
90f5c1d5d6 Merge "Rust: Vendor support for Rust static libraries." 2020-12-11 13:44:31 +00:00
Ivan Lozano
f48c89cd39 Merge "Refactor for preliminary Rust vendor image support" 2020-12-11 13:40:20 +00:00
Paul Duffin
452cdd33da Merge "Rename apexDepsMutator to apexInfoMutator" am: 08703826bd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1523982

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94665f28762bb06371457413a11d5927bfebf9eb
2020-12-11 10:42:10 +00:00
Paul Duffin
30642ff255 Merge "Extract testDexpreoptWithApexes() for reuse" am: 4d934af2ee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1523981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23f4aef12d2e3139f5f38e74bcde0937e9cc3598
2020-12-11 10:41:30 +00:00
Paul Duffin
08703826bd Merge "Rename apexDepsMutator to apexInfoMutator" 2020-12-11 10:06:19 +00:00
Paul Duffin
4d934af2ee Merge "Extract testDexpreoptWithApexes() for reuse" 2020-12-11 10:06:07 +00:00
Jiyong Park
0c6aecfa06 Merge "stub variants also re-exports headers" am: 6f05a73e3e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1518569

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1a4374aa65249fa3993ca5c3bfd971f331b725d
2020-12-11 09:25:42 +00:00
Jiyong Park
6f05a73e3e Merge "stub variants also re-exports headers" 2020-12-11 08:50:12 +00:00
Treehugger Robot
a16ff21ae3 Merge "Allow Bazel to write to an external DIST_DIR (outside of OUT_DIR)." am: 8574ae773f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1522757

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ce3d3ad1884e6ad4f42d1d92a18628c114ea3df
2020-12-11 05:41:00 +00:00
Treehugger Robot
8574ae773f Merge "Allow Bazel to write to an external DIST_DIR (outside of OUT_DIR)." 2020-12-11 05:16:32 +00:00
Jiyong Park
1ad8e16fbe stub variants also re-exports headers
This change fixes a bug that headers are not re-exported from stub
variants of a library, if the headers are not from header libs, but from
shared or static libs. This is because only header lib dependencies
are respected for stubs variants.

The fix is as follows. 1) dependencies to the shared/static libs are
added even for stubs variants. 2) instead, in depsToPaths, they are
treated like header libs (i.e. don't contribute to linkFile) for the
stubs variants.

Bug: 174558745
Test: m

Change-Id: Iab6c77e7817055d0f2d09cb114186b30164fc231
2020-12-11 13:48:28 +09:00
Treehugger Robot
96f96b8670 Merge changes I394a1b62,I6906be4c am: 5571f61bc1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1521881

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99733df3e07dd51b37768d51146fb7e3e9a345b6
2020-12-11 02:36:54 +00:00