Commit Graph

4020 Commits

Author SHA1 Message Date
Colin Cross
f9aabd719a Make apex use cc.GatherRequiredDepsForTests
Remove the duplicated native modules from apex_test.go.

Test: all soong tests
Change-Id: Ib88af058d23cf37446d7a4bb571edfb1e0880854
2020-02-19 19:07:11 -08:00
Colin Cross
f28329de73 Move NDK test modules into cc/testing.go
Move the NDK modules defined in app_test.go into cc/testing.go in
preparation for using sdk_version: "current" in more tests.

Test: all soong tests
Change-Id: I80bc31225fb4562fce42781219cefbbd6affae06
2020-02-19 18:59:15 -08:00
Automerger Merge Worker
b7d11f872b Merge "Fix .vendor suffix for snapshots" am: 578b7ac691 am: 0a431d17b6 am: 5fc19eecee
Change-Id: I357b21912236ec5c8b6f7d71bf29d5d85085a52b
2020-02-20 00:51:55 +00:00
Automerger Merge Worker
02b5c6faba Merge "Do not hide VNDK prebuilts from make" am: 07f37120e5 am: 9a99c6f5e7 am: b2742ef1c1
Change-Id: I772120fb8b4069149de47d368959489b8e7f4747
2020-02-20 00:51:46 +00:00
Automerger Merge Worker
64170a9a8d Merge "Fix build error on vendor_snapshot_static" am: 5b37383464 am: 93fc33c215 am: e8bba597dd
Change-Id: I17806959ec966a68347ac1950d07d0b6b4eb18f9
2020-02-20 00:51:37 +00:00
Automerger Merge Worker
c5a8848da8 Merge "Fix header deps of sysprop_library" am: 0298d036e9 am: 2009aa299b am: 5c260af50b
Change-Id: I7e80e4b18c0951053f59ba728ca631df2a2f51c1
2020-02-20 00:51:29 +00:00
Treehugger Robot
578b7ac691 Merge "Fix .vendor suffix for snapshots" 2020-02-20 00:02:44 +00:00
Treehugger Robot
07f37120e5 Merge "Do not hide VNDK prebuilts from make" 2020-02-20 00:02:40 +00:00
Treehugger Robot
5b37383464 Merge "Fix build error on vendor_snapshot_static" 2020-02-20 00:02:34 +00:00
Treehugger Robot
0298d036e9 Merge "Fix header deps of sysprop_library" 2020-02-20 00:02:28 +00:00
Automerger Merge Worker
92f08f159d Merge "Port IdentityCredential HAL to AIDL." am: c2937d29a8 am: 14e3fc1a29 am: 3f003e3917
Change-Id: If6989f33ec6965f1c63b1a2ca72bc2f99988b488
2020-02-19 23:18:16 +00:00
Chih-Hung Hsieh
de21a358c3 Enable bitwise-conditional-parentheses warning
Bug: 148286937
Test: make
Change-Id: Ib793e35e1f3098e2cce760bcbf0f115ae5764c7f
2020-02-19 22:54:42 +00:00
David Zeuthen
c2937d29a8 Merge "Port IdentityCredential HAL to AIDL." 2020-02-19 21:14:41 +00:00
Automerger Merge Worker
2a93a35752 Merge "Revert "Another round of no-vendor-variant VNDK whitelist cleanup"" am: ae83ce656d am: ab231ee744 am: 2d0fe41f83
Change-Id: I9b46a3708408aef10313bf23615052997428c874
2020-02-19 12:21:20 +00:00
Automerger Merge Worker
5a993174dc Merge "Add support for cc_binary in module_exports" am: 23be2bf941 am: 3114b0fc94 am: ae41b77938
Change-Id: I4a3aaff388fe15da9b804981fa0c2bd75899c3b6
2020-02-19 11:41:47 +00:00
Treehugger Robot
ae83ce656d Merge "Revert "Another round of no-vendor-variant VNDK whitelist cleanup"" 2020-02-19 11:33:48 +00:00
Treehugger Robot
23be2bf941 Merge "Add support for cc_binary in module_exports" 2020-02-19 10:56:38 +00:00
Inseob Kim
ed2641f469 Fix header deps of sysprop_library
This adds public header to deps correctly.

Bug: 148123511
Bug: 149252327
Test: VNDK_SNAPSHOT_BUILD_ARTIFACTS=true m dist vndk
Change-Id: Ib8df3dfb4a068a11fc647de8588cc52889d82fba
2020-02-19 15:30:02 +09:00
Albal Tai
7667b62920 Revert "Another round of no-vendor-variant VNDK whitelist cleanup"
This reverts commit 77def87329.

Reason for revert: <cop revert, broken build 6217456 on git_master on cf_x86_phone-userdebug_coverage>

Change-Id: Iaf64cfe8fdfe62d397719f7ca5cc7679e5858d91
2020-02-19 06:17:51 +00:00
Chih-hung Hsieh
252d7449ca Merge "Enable tautological-bitwise-compare warning" 2020-02-19 04:50:11 +00:00
Inseob Kim
5f64aeccdf Fix .vendor suffix for snapshots
.vendor suffix is meant to be attached for vendor variants of
modules without "vendor: true". So when we decide whether the suffix is
needed for a snapshot module, we should check if corresponding source
module is "vendor: true" or not, instead of checking vendor_available of
the source module.

Bug: 149252327
Test: manual
Change-Id: Ibde75737ddce8e1dc974453e88832f9272a2c66e
2020-02-19 13:49:44 +09:00
Automerger Merge Worker
aaeb2930b6 Merge "Do not add ccWrapper to ccNoDeps rule" am: 8a2d1b4d86 am: d90c0b9136 am: 0090db54d6
Change-Id: Ib887df74bf1cd7e6b917029002333bec6631bffb
2020-02-19 03:24:15 +00:00
Treehugger Robot
8a2d1b4d86 Merge "Do not add ccWrapper to ccNoDeps rule" 2020-02-19 02:34:33 +00:00
Automerger Merge Worker
af7dd22e6f Merge "Another round of no-vendor-variant VNDK whitelist cleanup" am: e6c44dc8be am: 0ac6055a39 am: 80cb25a798
Change-Id: I3152d7bbd2cbe245ff54cacad46e1ce15232c351
2020-02-19 00:31:47 +00:00
Vic Yang
e6c44dc8be Merge "Another round of no-vendor-variant VNDK whitelist cleanup" 2020-02-18 23:29:08 +00:00
Chih-Hung Hsieh
15631dce8a Enable tautological-bitwise-compare warning
Bug: 148831363
Test: make
Change-Id: I31285fec578a87e0d35c177cd599dcd6a66cf934
Merged-In: I9d1ba8ef50630e40d59e402c37ad1366a8e25ea6
2020-02-18 15:14:03 -08:00
Chih-hung Hsieh
d7af130c2e Merge "Enable tautological-bitwise-compare warning" 2020-02-18 22:58:23 +00:00
Automerger Merge Worker
0980f9a3ed Merge "Switch from clang-r377782 to clang-r377782b" am: 207b18ca35 am: 8fe9f07eef am: c00ad77dd8
Change-Id: Ib8082e47221d53e3084483f7c3c15d35f30a19c9
2020-02-18 22:37:19 +00:00
Chih-hung Hsieh
207b18ca35 Merge "Switch from clang-r377782 to clang-r377782b" 2020-02-18 21:59:06 +00:00
Automerger Merge Worker
e81fff6889 Merge "Statically link the unwinder into binaries packaged into an unbundled APEX with legacy_android10_support: true." am: d8b80bc683 am: 4b20d12832 am: 7fe957e171
Change-Id: Ic27432ee08f3acd6052ceeacb56249077a5edf65
2020-02-18 21:48:42 +00:00
Automerger Merge Worker
c09d834be8 Merge "Enable bool-operation warning" am: ab392f613e am: ca4375f54b am: 3f0bd0b32a
Change-Id: Ic2a5fe1809658a52856eeb627b8ce145df9c3611
2020-02-18 21:13:50 +00:00
Peter Collingbourne
d8b80bc683 Merge "Statically link the unwinder into binaries packaged into an unbundled APEX with legacy_android10_support: true." 2020-02-18 18:12:37 +00:00
Chih-hung Hsieh
ab392f613e Merge "Enable bool-operation warning" 2020-02-18 17:52:25 +00:00
Paul Duffin
25ce04bd3a Add support for cc_binary in module_exports
Bug: 142920869
Test: m nothing
Change-Id: Ib7e16cb323806782c2186e73e13642e4485fc149
2020-02-18 16:17:35 +00:00
Kousik Kumar
2976bfd568 Do not add ccWrapper to ccNoDeps rule
The "ccNoDeps" rule was introduced to separate out ".s" compilations
from other ".S" and ".c*" compilations. The ".s" compilation does not
produce a dependency file and does not support running a preprocessor
through it.
However, it does have ".include" directives, that do NOT take a macro,
but still does the equivalent of a "#include". The compilation of ".s"
assembly files also do NOT produce a dependency file.

Because they don't produce a dependency file AND because RBE's input
processor does not yet support finding dependencies for these files, I'm
making this change to not prepend rewrapper for these commands.

Test: Tested by running a build with this change and ensuring the ".s"
compilations aren't being sent to rewrapper.

Change-Id: I60bb14ff92596e4992e9f675bdc199f1440d4327
2020-02-18 08:00:17 -08:00
Jaewoong Jung
a4003406ed Merge "Simple refactoring of prefix related functions." am: 36b6aec26a am: 9bc4a38707 am: 7f2487d5cc
Change-Id: Ia383f411632524fa2fb3fb238f754900564172c7
2020-02-18 15:48:38 +00:00
Chih-Hung Hsieh
287a13fc7e Switch from clang-r377782 to clang-r377782b
Bug: 149509676
Test: make checkbuild
Change-Id: I30c4cda700522968da443cebd3a67a1c428ba2ef
2020-02-18 07:48:13 +00:00
Inseob Kim
c3b1a166d2 Fix build error on vendor_snapshot_static
Without this, Makefile wasn't able to link against
vendor_snapshot_static library.

Bug: 149252327
Test: manual linking
Change-Id: Idd65656b58d12f8489827df081ef08e40ceb5af9
2020-02-18 12:42:54 +09:00
Inseob Kim
2b96bf5441 Do not hide VNDK prebuilts from make
Flattened APEXes don't install modules hidden from make. This CL unhides
VNDK prebuilt modules to make VNDK APEX work correctly. The suffix for
VNDK prebuilt is still omitted if the version of prebuilt is same with
BOARD_VNDK_VERSION.

Bug: 149542527
Test: build arm64 GSI and flash
Test: Set BOARD_VNDK_VERSION and build
Change-Id: I54a7c14c93eccfefc81603ec3bb474a031bc55af
2020-02-17 19:01:13 +09:00
Jaewoong Jung
3aff5787e2 Simple refactoring of prefix related functions.
Rename the two prefix-in-list funcs so that their usages are clearer.
Also find and replace all the code that essentially does either.

This introduces additional loops in some places, but I think the added
readability and simplicity outweighs the performance degradation, which
should be negligible anyway.

Test: m nothing
Test: TreeHugger
Change-Id: I37e2276ca0c815105ed0031f23c0b1264b480e4f
2020-02-14 14:33:49 -08:00
Chih-Hung Hsieh
45709ee8f1 Enable tautological-bitwise-compare warning
Bug: 148831363
Test: make
Change-Id: I9d1ba8ef50630e40d59e402c37ad1366a8e25ea6
2020-02-14 13:25:09 -08:00
Vic Yang
77def87329 Another round of no-vendor-variant VNDK whitelist cleanup
Bug: 148082691
Test: Build success
Change-Id: Id33fd52ec3cae33322131cd9d1227522af6f2bca
2020-02-14 19:02:25 +00:00
Chih-Hung Hsieh
0e5bb2786f Enable bool-operation warning
Bug: 148287141
Test: make
Change-Id: Icec118284025d0631ad3db64e19c5efe3c21ce13
2020-02-14 10:34:44 -08:00
Ivan Lozano
58ed939a67 Merge "Remove execute-only support." am: d0bf3dbea8 am: 5d1461877d am: 50522fe8b8
Change-Id: I3cb63d6ca2070e296e46bd803fdeca1ea75d78f9
2020-02-14 15:26:59 +00:00
Ivan Lozano
d0bf3dbea8 Merge "Remove execute-only support." 2020-02-14 14:42:49 +00:00
Peter Collingbourne
dc4f986b2a Statically link the unwinder into binaries packaged into an unbundled APEX with legacy_android10_support: true.
Bug: 149075752
Test: tapas com.android.conscrypt com.android.tethering arm64
Test: m out/target/product/generic_arm64/{,symbols/}apex/com.android.{tethering,conscrypt}/lib64/libc++.so
Test: Verified that unwinder was dynamically linked to tethering's
Test: libc++ and statically linked to conscrypt's.
Test: lunch flame-userdebug && m
Test: Verified that unwinder was dynamically linked to /system/lib64/libc++.so
Change-Id: I98eed7cb4316962b19b5c12e150c224c25d0e91d
2020-02-13 22:29:44 -08:00
Treehugger Robot
6a3876a027 Merge "Bump the macOS version to 10.10." am: edb3174967 am: b4ea5e1069 am: b2f0dae04c
Change-Id: I392fd55f63fb01163b581afc798d48efedcd3350
2020-02-14 06:29:19 +00:00
Elliott Hughes
7622713c8d Bump the macOS version to 10.10.
Android Studio only claims to support macOS 10.10 and later, so we
probably shouldn't bother with anything older either.

Test: treehugger
Change-Id: I478cb52221198d7b7e2247dfbee4cd86d5bbd1a8
2020-02-13 16:23:12 -08:00
Chih-hung Hsieh
6b83521f90 Merge "Switch from clang-r370808b to clang-r377782" am: 8744cdffeb am: 1c04724bbd am: b0847994f6
Change-Id: If8aa3a6ad9a294feec95f10921d39291000c3f1e
2020-02-13 22:21:19 +00:00
Chih-hung Hsieh
8744cdffeb Merge "Switch from clang-r370808b to clang-r377782" 2020-02-13 21:46:35 +00:00