Commit Graph

2576 Commits

Author SHA1 Message Date
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
Cindy Zhou
7e82baa8fe Build against cfi supported coverage lib
The change will detect if a module is compiled against cfi support, and
will usebuild the coverage build against the libprofile that supports cfi. This is to resolve compilation errors when
building against modules with cfi support.
Bug: 177098919
Test: forrest build for cf_x86_phone-userdebug_coverage http://go/forrest-run/L81700000786828933

Change-Id: I8e0421cdf1c6e499292cfa3457cefd3c42f13155
2021-01-10 06:35:48 -08:00
Anton Hansson
9b57dbf5f1 Merge "Allowlist sdkextensions proto lib" am: c7ca43ec92 am: 23b9409b40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1542066

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5bba69ed27e7ba2508eb171cdc0c679a8de13cb7
2021-01-08 10:13:07 +00:00
Anton Hansson
c7ca43ec92 Merge "Allowlist sdkextensions proto lib" 2021-01-08 09:39:41 +00:00
Winson Chung
039b0c5915 Update allowed dependencies for AndroidX prebuilt drop
Bug: 175330528
Test: Builds
Change-Id: If0a5b0f029bc1e7241415121723abdcf1928327a
2021-01-07 20:01:03 -08:00
lucaslin
5a73550925 Add netd-client for tethering apex and update allowed-deps.txt
Split some code from Tethering apex to frameworks/libs/net and
have a new library(netd-client) for it. So basically, netd-client
contains code which was already in Tethering apex.
netd-client also links to netd_aidl_interface-java and
netd_event_listener_interface-java, so netd_aidl_interface-java
and netd_event_listener_interface-java are also added into
allowed-deps.txt.

Bug: 174837473
Test: Manual test and check the log.
Change-Id: I31a467f02a8f3049e005d771d61f3d990ac9b8ba
Merged-In: I31a467f02a8f3049e005d771d61f3d990ac9b8ba
2021-01-08 01:56:11 +00:00
Treehugger Robot
d1dae886d7 Merge "android_filesystem modules can be included in APEX" am: 1985115ff1 am: 1b6e06fb44 am: cb62efdca9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1540668

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25e79f8524ac12e218f1bf2289fd10f89b79068a
2021-01-08 01:27:28 +00:00
Treehugger Robot
cb62efdca9 Merge "android_filesystem modules can be included in APEX" am: 1985115ff1 am: 1b6e06fb44
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1540668

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d53f2879bd6d4ef52f59d750cc8eb8004c60ea2
2021-01-08 01:00:53 +00:00
Treehugger Robot
1985115ff1 Merge "android_filesystem modules can be included in APEX" 2021-01-08 00:32:19 +00:00
Bob Badour
ed04b47876 Merge changes from topic "revert-1541855-revert-1377717-metalics-BOEMJWNSHV-PBOZXBJQZD" am: ddac9bf3f2 am: adf19116d3 am: 72deb7feda
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1540840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5799dc9b0af0a0f2f36413ed69341dc318cf96ed
2021-01-07 23:48:20 +00:00
Bob Badour
72deb7feda Merge changes from topic "revert-1541855-revert-1377717-metalics-BOEMJWNSHV-PBOZXBJQZD" am: ddac9bf3f2 am: adf19116d3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1540840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17c75654bf575e5ebdee04fdbb48932c151088c0
2021-01-07 23:21:14 +00:00
Bob Badour
ddac9bf3f2 Merge changes from topic "revert-1541855-revert-1377717-metalics-BOEMJWNSHV-PBOZXBJQZD"
* changes:
  Revert^2 "Define the standard license_kind rules."
  Revert^2 "Export soong license data to make."
  Revert^2 "Add ability to declare licenses in soong."
2021-01-07 22:42:08 +00:00
Colin Cross
912f1700a8 Merge "Split vndk_libraries_txt into multiple module types" am: ee7d0fd0f6 am: 15e8f2b6ca am: 8e37c43f3d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1541063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I445abaa15513343916904d063ca106b30d5cd0b1
2021-01-07 19:20:21 +00:00
Colin Cross
8e37c43f3d Merge "Split vndk_libraries_txt into multiple module types" am: ee7d0fd0f6 am: 15e8f2b6ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1541063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b2146dcaed52895991508c4ecfa65f40ddf6af7
2021-01-07 18:55:38 +00:00
Anton Hansson
2ef1084896 Allowlist sdkextensions proto lib
This is safe for apex use.

Bug: 173188089
Test: m apex-allowed-deps-check
Merged-In: Ib4a69d93843d4e3b44073c79e704c5fc1635c1ad
Change-Id: Ib4a69d93843d4e3b44073c79e704c5fc1635c1ad
2021-01-07 13:00:20 +00:00
Anton Hansson
60cf3e24d2 Allowlist sdkextensions proto lib
This is safe for apex use.

Bug: 173188089
Test: m apex-allowed-deps-check
Merged-In: Ib4a69d93843d4e3b44073c79e704c5fc1635c1ad
Change-Id: Ib4a69d93843d4e3b44073c79e704c5fc1635c1ad
(cherry picked from commit 17b1dd80cf7cf30686431320bf00054f3290b747)
2021-01-07 13:00:04 +00:00
Anton Hansson
1827b46630 Allowlist sdkextensions proto lib
This is safe for apex use.

Bug: 173188089
Test: m apex-allowed-deps-check
Change-Id: Ib4a69d93843d4e3b44073c79e704c5fc1635c1ad
(cherry picked from commit a9a2fc5294878734b3a22df6e1cb3de89cd6e832)
2021-01-07 12:59:41 +00:00
Jiyong Park
12a719c0fc android_filesystem modules can be included in APEX
android_filesystem modules can be included in APEX via the new
`filesystems` property. The filesystem images are placed at
./etc/fs/<modulename>.img.

Bug: 172413888
Test: m nothing

Change-Id: I215ca7a32ff1988a0de4e1f71397684e189839ea
2021-01-07 15:35:25 +09:00
Bob Badour
b499922acc Revert^2 "Export soong license data to make."
61a55a0344

Change-Id: I5fb017c683df18bad42a8e27fb2d7c7c510514e5
2021-01-06 20:49:11 -08:00
Treehugger Robot
c6b6483362 Merge "Create vndkproduct.libraries.txt" am: 47d186cd4e am: 184f4f0668 am: f2fc837d01
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1519461

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I927426ae76b9755bb5ec9a48c42bdc53ee0b5051
2021-01-07 03:16:26 +00:00
Treehugger Robot
f2fc837d01 Merge "Create vndkproduct.libraries.txt" am: 47d186cd4e am: 184f4f0668
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1519461

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0620b8fb6ba1a85124275df92df418bf58bd0447
2021-01-07 02:25:37 +00:00
Colin Cross
e4e44bc61b Split vndk_libraries_txt into multiple module types
Replace the vndk_libraries_txt module type with llndk_libraries_txt,
etc. in preparation for making it a new SingletonModule, which will
only work with a single instance of the module type.

Bug: 176904285
Test: m checkbuild
Change-Id: Ie010a9eeee8f5849201aa4ab4eb9b2e7a9cd7d5b
2021-01-06 17:54:30 -08:00
Treehugger Robot
47d186cd4e Merge "Create vndkproduct.libraries.txt" 2021-01-07 01:43:15 +00:00
Bob Badour
a163fe55f9 Merge changes from topic "revert-1377717-metalics-BOEMJWNSHV" am: a1b87c81ca am: 72b5c0288a am: 15ef54bab8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1541852

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I917681ef203a9974b958ef1086f4e8e161cb7baa
2021-01-06 20:22:46 +00:00
Bob Badour
15ef54bab8 Merge changes from topic "revert-1377717-metalics-BOEMJWNSHV" am: a1b87c81ca am: 72b5c0288a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1541852

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie75ae43eb4e19104a2d7702819de6ab57a97bf5b
2021-01-06 20:01:12 +00:00
Bob Badour
5293a09d57 Export soong license data to make. am: 74fab31712 am: de77ecd56b am: 0b061c969c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1454916

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6decb1f33ea120a79a8de2c5b26dd4d87db627d3
2021-01-06 19:54:08 +00:00
Bob Badour
a1b87c81ca Merge changes from topic "revert-1377717-metalics-BOEMJWNSHV"
* changes:
  Revert "Add ability to declare licenses in soong."
  Revert "Export soong license data to make."
  Revert "Define the standard license_kind rules."
2021-01-06 19:17:45 +00:00
Bob Badour
0b061c969c Export soong license data to make. am: 74fab31712 am: de77ecd56b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1454916

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d9075f4d60f9c94b18345cb67e800f10af1e338
2021-01-06 19:12:13 +00:00
Jerome Gaillard
61a55a0344 Revert "Export soong license data to make."
Revert submission 1377717-metalics

Reason for revert: This has broken renderscript_mac target for aosp-master, see b/176909442

Reverted Changes:
I26ac54ca9:Define the standard license_kind rules.
I656486070:Export soong license data to make.
If9d661dfc:Export soong license data to make.
I97943de53:Add ability to declare licenses in soong.
Icaff40171:Rough-in license metadata support to make.
Ib8e538bd0:Add variables for notice deps, license kinds etc.

Change-Id: I51799c94a274eadab414abd80a07b5cda4584be9
2021-01-06 19:00:05 +00:00
Bob Badour
de77ecd56b Export soong license data to make. am: 74fab31712
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1454916

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied2ab6fb4455326b4e0f1f58fba8d637a2a8f3c9
2021-01-06 18:42:30 +00:00
Bob Badour
659f11fcfc Merge changes from topic "metalics"
* changes:
  Define the standard license_kind rules.
  Export soong license data to make.
  Add ability to declare licenses in soong.
2021-01-06 18:08:07 +00:00
Anton Hansson
d969b53e8a Merge "Allow-list libderive_sdk" am: 22313cb192 am: 6c7a32effc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1538882

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59e570a631f184816af61bb8179245678828d3c5
2021-01-06 11:11:31 +00:00
Anton Hansson
22313cb192 Merge "Allow-list libderive_sdk" 2021-01-06 10:10:48 +00:00
Treehugger Robot
389e892e41 Merge "Add TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION" am: 0d96ed8d5b am: 0ff3ac38cb am: ee12c19685
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1540045

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I739f2cea0952f17e3eba175578164ab0e3e4b866
2021-01-06 05:08:52 +00:00
Treehugger Robot
ee12c19685 Merge "Add TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION" am: 0d96ed8d5b am: 0ff3ac38cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1540045

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b21f04591e8babc9f79f88fad159304630900db
2021-01-06 04:51:13 +00:00