Commit Graph

1709 Commits

Author SHA1 Message Date
Hyundo Moon
5c8da738e2 Merge "Allow service-media-s in apex" am: 2b7d4e1ba4 am: 0f4f57c874 am: b1df1811a5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1552047

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f0ef4e0a298d1abe9293a675fdaf8e3bd0d6c98
2021-01-21 16:36:13 +00:00
Treehugger Robot
0d8aa8738d Merge "LOCAL_REQUIRED_MODULES from apex has ":32" or ":64" suffix" am: d684e04247 am: 8cad077197 am: 67c3e24f07
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1554988

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4141d6a90656048ee7230d3fd2078c5a4f9d5c18
2021-01-21 16:36:03 +00:00
Hyundo Moon
b1df1811a5 Merge "Allow service-media-s in apex" am: 2b7d4e1ba4 am: 0f4f57c874
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1552047

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7401a60614c1c9fdd20158ee52f7e83a7fbe1c73
2021-01-21 16:00:31 +00:00
Treehugger Robot
67c3e24f07 Merge "LOCAL_REQUIRED_MODULES from apex has ":32" or ":64" suffix" am: d684e04247 am: 8cad077197
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1554988

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ae1fe2d82965048cd1540770220630debcee87d
2021-01-21 16:00:11 +00:00
Hyundo Moon
2b7d4e1ba4 Merge "Allow service-media-s in apex" 2021-01-21 15:00:13 +00:00
Treehugger Robot
d684e04247 Merge "LOCAL_REQUIRED_MODULES from apex has ":32" or ":64" suffix" 2021-01-21 14:34:37 +00:00
Hyundo Moon
8bee1b00ea Allow service-media-s in apex
Bug: 175511943
Test: Builds successfully
Change-Id: I5d76087d3c537205e8b8ca837c13ca1aeb641b4c
2021-01-21 02:21:23 +00:00
Ulyana Trafimovich
1a2949251b Merge "Support building boot images with disabled dexpreopt." am: 0caabb6e27 am: 5602cf202b am: fb9314da42
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555134

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c35fc8382ab51307e4cb5e4a0b8b2d4c5553f8b
2021-01-20 19:46:47 +00:00
Bill Peckham
dccab29858 Merge changes from topic "prebuilt-hiddenapi" am: 1c8e5e817e am: 24ac16d6e6 am: 96ddf7f0b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1546365

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I626d7b1481b000c75a949522b91db36fc2fe213a
2021-01-20 19:46:31 +00:00
Ulyana Trafimovich
fb9314da42 Merge "Support building boot images with disabled dexpreopt." am: 0caabb6e27 am: 5602cf202b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1555134

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21223b7babf61153570127b16157217316dfe52c
2021-01-20 19:02:18 +00:00
Bill Peckham
96ddf7f0b3 Merge changes from topic "prebuilt-hiddenapi" am: 1c8e5e817e am: 24ac16d6e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1546365

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e9ae289f82169794342723ba653a95a1f79241a
2021-01-20 19:02:05 +00:00
Ulyana Trafimovich
0caabb6e27 Merge "Support building boot images with disabled dexpreopt." 2021-01-20 17:46:02 +00:00
Bill Peckham
1c8e5e817e Merge changes from topic "prebuilt-hiddenapi"
* changes:
  Supply LOCAL_SOONG_DEX_JAR for java_import with compile_dex.
  Enable an apex to include a java_import.
  Enable prebuilt hiddenapi CSV files.
2021-01-20 17:43:48 +00:00
Mohammad Islam
d7c126ffcf Merge "Fix capex build rule when building using RBE" am: 43c2fe1620 am: 68a9c0aff2 am: 3523ffa793
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1554058

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72676b7afd4e8c11b85a24d20c516dcb4c3a5731
2021-01-20 16:19:28 +00:00
Mohammad Islam
3523ffa793 Merge "Fix capex build rule when building using RBE" am: 43c2fe1620 am: 68a9c0aff2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1554058

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1af9b8c52eb2203e4b17408550b1148269926b2
2021-01-20 15:31:49 +00:00
Mohammad Islam
43c2fe1620 Merge "Fix capex build rule when building using RBE" 2021-01-20 14:21:17 +00:00
Ulya Trafimovich
a4a1c4ee98 Support building boot images with disabled dexpreopt.
Bug: 176171716
Test: build_mainline_modules.sh and ensure that the ART boot image is
    built: `find out -type f -name '*.art'` is nonempty for every arch.
Change-Id: Ibc45581eef2b205c750a30709780cf659ba7cfa1
2021-01-20 14:03:07 +00:00
Jiyong Park
57621b29c4 LOCAL_REQUIRED_MODULES from apex has ":32" or ":64" suffix
Currently, when a module is included in an APEX, the dependencies of the
modules are listed in LOCAL_REQUIRED_MODULES of the APEX. There are two
purposes for this:

1) for native dependencies, they are installed to
$(TARGET_OUT)/apex/<apexname> directories which isn't packaged as an
*.img. However, as a side effect of the installation, their symbol files
are placed under $(TARGET_OUT)/symbols directory to aid debugging.

2) to implement the symlink optimization. When the APEX is not
updatable, the dependencies are not included inside the APEX, but
installed directly to /system partition because the same files might be
used outside of the APEX. The files in the APEX are replaced with
symlinks to the system copy.

So far, the module name like "libfoo" was directly used in
LOCAL_REQUIRED_MODULES. This becomes problematic when only a single arch
variant of the module is used by the APEX. The build system will install
both arch variants to the system partition.

This change fixes the problem by appending ":32" or ":64" suffix
when composing LOCAL_REQUIRED_MODULES.

Bug: N/A
Test: m
Test: Cherry-pick I285c5d1bb9b27265c8589f2588d95eafa324d412 and its
dependencies from internal master. `m nothing` doesn't show the artifact
path requirement error.

Change-Id: I78feae1d5b18f93b0f984d3b1558812fd1689a96
2021-01-20 20:44:35 +09:00
Ryan Prichard
6761a5eeae Merge "Switch platform EH unwinder to prebuilt LLVM libunwind" am: 809eac3057 am: 048809c624 am: 471dfd6809
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1551580

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93276241d217b7d2ebdffa58abb60d2d0721c672
2021-01-20 02:15:55 +00:00
Ryan Prichard
471dfd6809 Merge "Switch platform EH unwinder to prebuilt LLVM libunwind" am: 809eac3057 am: 048809c624
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1551580

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d3ced17f7aadbc27498a89eedc2b9f8df9f4a3c
2021-01-20 01:53:10 +00:00
Ryan Prichard
809eac3057 Merge "Switch platform EH unwinder to prebuilt LLVM libunwind" 2021-01-20 00:10:59 +00:00
Bill Peckham
a41a6963b4 Enable an apex to include a java_import.
With the addition of the compile_dex property to the
java_import module it becomes possible to include a
java_import module in an apex. This change allows the
dependency and adds a test.

Bug: 177228901
Test: m nothing
Test: new TestApexWithJavaImport
Change-Id: I9336dade1857109e2fd21f7d57e1dc4abc4a402c
2021-01-19 18:15:03 +00:00
Paul Duffin
d8733e056d Merge "Export dex implementation jars from prebuilt_apex" am: fe6147eb26 am: c022da2b2a am: bf4b8488e9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1523984

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ec430725444022e43e9532964fdf4134031158c
2021-01-19 16:43:57 +00:00
Paul Duffin
bf4b8488e9 Merge "Export dex implementation jars from prebuilt_apex" am: fe6147eb26 am: c022da2b2a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1523984

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1a7c988c1afe2d53982d33ffc2b93853189169c
2021-01-19 15:56:16 +00:00
Mohammad Samiul Islam
9ac0e32979 Fix capex build rule when building using RBE
Presubmit builds were failing cause they were being built using RBE.

Bug: 172911362
Test: presubmit-builds are passing now
Change-Id: I65ffd912ccf2f4fb8cb9824e7a9579f66908d7b3
2021-01-19 11:32:29 +00:00
Paul Duffin
064b70c918 Export dex implementation jars from prebuilt_apex
Dexpreopt and boot jars package check all require access to dex
implementation jars created for java_library and java_sdk_library. They
were available when building from source but not when building from
prebuilts, even though they are embedded within the .apex files that
are referenced from prebuilt_apex.

This changes adds support to prebuilt_apex to export the dex
implementation jars and updates java_import to use those exported dex
implementation jars.

In a source build dexpreopt/boot jars package check access the apex (or
platform) specific variant of a java_library, e.g. core-oj, from which
it retrieves the dex implementation jar path.

After this change in a prebuilt build dexpreopt/boot jars package check
behave in the same way except in this case they retrieve the dex
implementation jar path from the apex (or platform) specific variant of
the java_import, e.g. core-oj.

The work to export files from a `.apex` file for use by other modules
is performed by a new `deapexer` module type. It is not used directly
in an `Android.bp` file but instead is created implicitly by
`prebuilt_apex`,

In order to do that this contains the following changes:
* Adds a new `dexapexer` module type to handle the exporting of files
  from the `.apex` file.
* Adds an exported_java_libs property to prebuilt_apex to specify the
  set of libraries whose dex implementation jars need exporting.
* Creates apex specific variants of the libraries listed in the
  exported_java_libs property.
* Adds the set of exported files to the ApexInfo to make them available
  to the apex specific variants.
* Prevents the prebuilt_apex variants from being merged together as
  they will not be compatible.
* Modifies java_import to use the exported file for variants of a
  prebuilt_apex.
* Adds a ninja rule to unpack (using deapexer) the contents of the
  prebuilt_apex's apex file, verify that the required files are present
  and make them available as outputs for other rules to use.
* Some minor refactorings to support these changes.
* Adds tests to cover prebuilt only, prebuilt with source preferred,
  and prebuilt preferred with source.

Test: m nothing
Bug: 171061220
Change-Id: Ic9bed81fb65b92f0d59f64c0bce168a9ed44cfac
2021-01-15 18:14:10 +00:00
Paul Duffin
a412e4c725 Merge "Extract ApexFileProperties from apex PrebuiltProperties" am: 4746ae400c am: 191af7042f am: 2997dd8a45
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1549977

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I845449212f93f5f7f2b16de6d74c1e6fb2baad2c
2021-01-15 13:54:50 +00:00
Treehugger Robot
29e0b6b614 Merge "Update apex/allowed_deps.txt" am: 2463ec5ad5 am: 1e0cf8adcc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1550754

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I647dcae82f9e56013f1326a11e00e5bf9010fae7
2021-01-14 12:25:48 +00:00
Paul Duffin
2997dd8a45 Merge "Extract ApexFileProperties from apex PrebuiltProperties" am: 4746ae400c am: 191af7042f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1549977

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05fa4bbd4bb6a618f76e60767517e98c6b1b9ce5
2021-01-14 12:25:30 +00:00
Treehugger Robot
2463ec5ad5 Merge "Update apex/allowed_deps.txt" 2021-01-14 11:35:06 +00:00
Paul Duffin
4746ae400c Merge "Extract ApexFileProperties from apex PrebuiltProperties" 2021-01-14 11:07:16 +00:00
Mill Chen
797e067b1c Update apex/allowed_deps.txt
Import intermediate-AndroidX Design Library from local Maven ZIP.

Bug: 177216791
Test: build/soong/scripts/update-apex-allowed-deps.sh
Change-Id: Iffdf5e03f76fa5583a751d048ccb85b69c091de2
Merged-In: Iffdf5e03f76fa5583a751d048ccb85b69c091de2
2021-01-14 17:57:05 +08:00
Maciej Żenczykowski
ddd82187ca Merge "Add bpf_syscall_wrappers for tethering apex and update allowed-deps.txt" am: 47dbd2619b am: 54856779ce am: 90582a424c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1549716

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I567ae6221e037afe9c57319debb5ec630b774824
2021-01-14 09:06:02 +00:00
Maciej Żenczykowski
90582a424c Merge "Add bpf_syscall_wrappers for tethering apex and update allowed-deps.txt" am: 47dbd2619b am: 54856779ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1549716

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia11abb7a264b33261cb37b67eeced2fbe21a27f5
2021-01-14 08:27:24 +00:00
Maciej Żenczykowski
47dbd2619b Merge "Add bpf_syscall_wrappers for tethering apex and update allowed-deps.txt" 2021-01-14 07:36:50 +00:00
Ryan Prichard
b35a85ee8b Switch platform EH unwinder to prebuilt LLVM libunwind
For the platform libc++ STL, remove the
-Wl,--exclude-libs,libunwind_llvm.a argument, which is redundant with
the same argument in deviceGlobalLdflags.

Bug: http://b/153025717
Test: device boots
Change-Id: Idd7791d52f74aab2d5f59419fb75f841fc29a2eb
2021-01-13 19:51:06 -08:00
Mill Chen
78992ffad8 Merge "Update apex/allowed_deps.txt" 2021-01-14 02:34:03 +00:00
Paul Duffin
851f3995bc Extract ApexFileProperties from apex PrebuiltProperties
The properties and logic to select the appropriate arch specific src
property will need to be shared between the 'prebuilt_apex' module type
and an upcoming 'deapexer' module type to which the `prebuilt_apex`
will delegate responsibility for exporting the '.apex' file's contents.
This refactoring extracts them into the new ApexFileProperties struct
for reuse.

Bug: 171061220
Test: m nothing
Change-Id: Iac321a28afc469e885ee5b19ad33fecd94117236
2021-01-13 23:22:13 +00:00
Evgenii Stepanov
4aa5df2f16 Merge "Add memtag_heap notes to allowed deps." am: 8b638ad78e am: f9f472e739
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1548884

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d719b47d62e216c756ce20d618809d0cd3f2669
2021-01-13 20:57:46 +00:00
Hungming Chen
e261c0107a Add bpf_syscall_wrappers for tethering apex and update allowed-deps.txt
Split the BPF system calls header definition into a new header library
(bpf_syscall_wrappers). Both platform and tethering apex require the
BPF system call definition. Move the definition from system/bpf/
libbpf_android/include/bpf/BpfUtils.h to frameworks/libs/net/
common/native/bpf_syscall_wrappers

Test: build, flash and run atest BpfMapTest
Change-Id: Ief5ffbb96c216796e4f0f4cacbde7c08f4af274a
2021-01-13 17:09:21 +00:00
Evgenii Stepanov
aa12c9b040 Add memtag_heap notes to allowed deps.
Bug: b/135772972
Test: build with SANITIZE_TARGET=memtag_heap
Merged-In: Id580f55cc9ee6d0ef452d7c0d84f56bf8cd1402a
Change-Id: Id580f55cc9ee6d0ef452d7c0d84f56bf8cd1402a
2021-01-12 21:22:35 -08:00
Evgenii Stepanov
67b8908048 Add memtag_heap notes to allowed deps.
Bug: b/135772972
Test: build with SANITIZE_TARGET=memtag_heap
Change-Id: Id580f55cc9ee6d0ef452d7c0d84f56bf8cd1402a
2021-01-12 21:20:33 -08:00
Mohammad Islam
d96cbba6fe Merge "Add property to apex soong modules to forcefully compress an APEX" am: fdb9e89642 am: d09fa7b142 am: 6e7da957a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1535000

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f88bdbddc116b4e536bbca18c80054cdf0ca387
2021-01-12 15:14:35 +00:00
Mohammad Islam
6e7da957a3 Merge "Add property to apex soong modules to forcefully compress an APEX" am: fdb9e89642 am: d09fa7b142
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1535000

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7de1316f3bc3fb9fb0cf01b955df683824a8452
2021-01-12 14:59:18 +00:00
Mohammad Islam
fdb9e89642 Merge "Add property to apex soong modules to forcefully compress an APEX" 2021-01-12 13:51:50 +00:00
Mill Chen
07b96ffc34 Update apex/allowed_deps.txt
Import intermediate-AndroidX Design Library from local Maven ZIP.

Bug: 177216791
Test: build/soong/scripts/update-apex-allowed-deps.sh
Change-Id: Iffdf5e03f76fa5583a751d048ccb85b69c091de2
2021-01-12 14:33:49 +08:00
Cindy Zhou
16d02e9e7f Merge "Build against cfi supported coverage lib" 2021-01-11 19:33:16 +00:00
Winson Chung
c5d0090fca Merge "Update allowed dependencies for AndroidX prebuilt drop" 2021-01-11 16:30:21 +00:00
Lucas Lin
5b31bd1d02 Merge "Add netd-client for tethering apex and update allowed-deps.txt" am: dcd957eac5 am: 4a657b3007
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1519459

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia88a4d047ca5a5ac6fad1727da94681c0a2d9ff1
2021-01-11 02:22:43 +00:00
Lucas Lin
dcd957eac5 Merge "Add netd-client for tethering apex and update allowed-deps.txt" 2021-01-11 01:49:12 +00:00