Commit graph

20236 commits

Author SHA1 Message Date
Automerger Merge Worker
33ed43be08 [automerger skipped] Merge "Enable bitwise-conditional-parentheses warning" am: 78620004fc am: d4fff11609 -s ours am: e095e10279 -s ours
am skip reason: Change-Id Ib793e35e1f3098e2cce760bcbf0f115ae5764c7f with SHA-1 de21a358c3 is in history

Change-Id: I77e459764d733f2237cf5fbff2617515dc3c59cf
2020-02-20 22:48:57 +00:00
Automerger Merge Worker
e095e10279 [automerger skipped] Merge "Enable bitwise-conditional-parentheses warning" am: 78620004fc am: d4fff11609 -s ours
am skip reason: Change-Id Ib793e35e1f3098e2cce760bcbf0f115ae5764c7f with SHA-1 de21a358c3 is in history

Change-Id: I1c514a42ba8039c75661ee1f906669e7218ced7d
2020-02-20 22:31:28 +00:00
Automerger Merge Worker
d4fff11609 Merge "Enable bitwise-conditional-parentheses warning" am: 78620004fc
Change-Id: I2e8678c0e78ea4d97ac7bddac701f6916effd608
2020-02-20 22:11:26 +00:00
Nikita Ioffe
19fed2b4b9 Merge "For Q APEXes default target_sdk_version and min_sdk_version to 29" 2020-02-20 22:10:50 +00:00
Chih-hung Hsieh
78620004fc Merge "Enable bitwise-conditional-parentheses warning" 2020-02-20 21:55:28 +00:00
Paul Duffin
5efd1985d1 Ensure consistent handling of generated headers/dirs
The list of exported generated headers are all expected to be within
one of the exported generated include dirs. Previously, that was not
the case as ExportedGeneratedIncludeDirs was suitable for extracting
to common properties (which changes the output location) and
exportedGeneratedHeaders was not.

This would cause a problem if there was only one variant. In that case
the ExportedGeneratedIncludeDirs would be treated as a common property
and placed in include_gen/<x> directory while exportedGeneratedHeaders
would be treated as an arch specific property and placed in
<arch>/include_gen/<x>.

Bug: 142935992
Test: m nothing
Change-Id: Idf82a5ca551b44ec31971c7ff3bd957a4c38f396
2020-02-20 21:52:02 +00:00
Paul Duffin
583bf7ebf7 Do not add dependencies from disabled sdk variants to its members
If an sdk variant is disabled (e.g. say windows) then it should not
add dependencies on corresponding sdk member variants as if those
variants have not been created then the build breaks unnecessarily.

This is needed to make progress on unbundling art which provides at
least one host tool (dex2oat) that is not supported on all platforms
and some (hiddenapi) that only produce 64 bit versions.
Initially, the art prebuilts will only support building 64 bit
versions of linux host tools.

Bug: 142935992
Test: m art-module-sdk art-module-host-exports art-module-test-exports
Change-Id: Idfbb40bb3cabc6eb731a2b38f045ed14f0a713cc
2020-02-20 21:51:52 +00:00
Automerger Merge Worker
96574500db Merge changes from topic "soong_tests_ndk" am: 53fe467c67 am: 563533c0e6 am: 56f90a17fe
Change-Id: Ia267936ad071f362b92a788fb49b1dcb2ae44d3f
2020-02-20 21:36:00 +00:00
Automerger Merge Worker
2f4e3cc276 Move NDK test modules into cc/testing.go am: f28329de73 am: 8a9806b3b1 am: 09bb178aea
Change-Id: I84af2424f82cf9bdfbeefb1b54d96107c930a71e
2020-02-20 21:35:57 +00:00
Automerger Merge Worker
56f90a17fe Merge changes from topic "soong_tests_ndk" am: 53fe467c67 am: 563533c0e6
Change-Id: I0e2cbd23cf3471129102c850c987a6c9f20590a2
2020-02-20 21:23:29 +00:00
Automerger Merge Worker
09bb178aea Move NDK test modules into cc/testing.go am: f28329de73 am: 8a9806b3b1
Change-Id: I68825d36d7bf849b7c10d43ce5e12b94d87a7a5c
2020-02-20 21:23:27 +00:00
Automerger Merge Worker
563533c0e6 Merge changes from topic "soong_tests_ndk" am: 53fe467c67
Change-Id: I7b5109b80a8a74344b41c04dc8794ba381c90963
2020-02-20 21:01:26 +00:00
Automerger Merge Worker
8a9806b3b1 Move NDK test modules into cc/testing.go am: f28329de73
Change-Id: I5500dc262f1ee5cf96762b3b0161688666083531
2020-02-20 21:01:23 +00:00
Treehugger Robot
53fe467c67 Merge changes from topic "soong_tests_ndk"
* changes:
  Make apex use cc.GatherRequiredDepsForTests
  Move NDK test modules into cc/testing.go
2020-02-20 20:39:16 +00:00
Automerger Merge Worker
5055cecebb Merge "Use flag names with merge_csv.py." am: 112045230d am: 5d5b2d7484 am: 7e2406594b
Change-Id: I02c9775ef5a4b930970f7c1c96020bbd743497ec
2020-02-20 20:34:40 +00:00
Ivan Lozano
9ac32c7674 Allow Linux hosts to use ubsan runtime sanitizers.
Linux host prebuilts for UBSan runtime are available now, so we can
enable these. There's a bit more work to be done for Windows/Darwin
support, so that's left to another CL.

Bug: 148289941
Test: Build host binary with integer overflow sanitization enabled.
Test: ./art/test/testrunner/run_build_test_target.py art-linux-bionic-x64

Change-Id: Ie98979116fa3bb8accb23d1788adcc28330a9530
2020-02-20 20:27:35 +00:00
Automerger Merge Worker
7e2406594b Merge "Use flag names with merge_csv.py." am: 112045230d am: 5d5b2d7484
Change-Id: I016ae092f752dfbe237319ad03c44166deccbcc1
2020-02-20 20:18:54 +00:00
Automerger Merge Worker
5d5b2d7484 Merge "Use flag names with merge_csv.py." am: 112045230d
Change-Id: If461c67adcc7c0f4aebdc91c6879dbbe1a27afd4
2020-02-20 19:32:04 +00:00
Treehugger Robot
112045230d Merge "Use flag names with merge_csv.py." 2020-02-20 19:17:19 +00:00
Automerger Merge Worker
0868e2edc9 Merge "bpf progs depend on system/core/libcutils/include" am: 3a15b8973d am: 504f279963 am: ff97d23369
Change-Id: I930166f6a4e88036c1f8550e88ae6ea6b9eae7b8
2020-02-20 17:09:33 +00:00
Automerger Merge Worker
cc94ebced2 Create manifest_utils library target. am: 3be82c00fe am: e7f40ede4b am: 5f339ee730
Change-Id: I2602f318e07f8caa8f27994ff87b0fc2695d6450
2020-02-20 17:09:19 +00:00
Automerger Merge Worker
ff97d23369 Merge "bpf progs depend on system/core/libcutils/include" am: 3a15b8973d am: 504f279963
Change-Id: Ie77c35f3005ee9b2d149c76853c5a681209d4c39
2020-02-20 16:57:57 +00:00
Automerger Merge Worker
5f339ee730 Create manifest_utils library target. am: 3be82c00fe am: e7f40ede4b
Change-Id: Ib27ff6af23c7068ac24ad309da6969e41e42969a
2020-02-20 16:57:47 +00:00
Automerger Merge Worker
504f279963 Merge "bpf progs depend on system/core/libcutils/include" am: 3a15b8973d
Change-Id: I864a3ce3236c29b5313e769df4da58c5196551ee
2020-02-20 16:34:35 +00:00
Automerger Merge Worker
e7f40ede4b Create manifest_utils library target. am: 3be82c00fe
Change-Id: Icd248828370618ae7c654f79e65f3a09338d1fd3
2020-02-20 16:34:21 +00:00
Maciej Żenczykowski
3a15b8973d Merge "bpf progs depend on system/core/libcutils/include" 2020-02-20 16:31:31 +00:00
Baligh Uddin
3be82c00fe Create manifest_utils library target.
This utility can also be used for parsing and
managing the Android Manifest for apex under
system/apex/apexer.

Test:
python manifest_fixer_test.py
python manifest_check_test.py

BUG: 148198056
Change-Id: Iffe465b5f36b2a3fbf81414d6f19e241c5f5648f
2020-02-20 15:58:00 +00:00
Lingfeng Yang
0f8c5b4ac8 Add minijail to whitelist.go
The latest version of crosvm refers to minijail as a separate crate:

2dae56768c%5E%21/#F1

The current version of minijail in aosp crosvm-master isn't a crate,
but minijail in aosp master is a crate and builds with crosvm.

This allows the latest version of crosvm to build in the Android tree
and use minijail in the same tree.

Change-Id: I2231149f1488727754430183d04072c5cc0f570a
2020-02-20 07:27:15 -08:00
Automerger Merge Worker
67f5911b8b Simplify visibility rules that include //visibility:public am: 44885e29d6 am: bd51a99225 am: 769226c559
Change-Id: Id89f0cea35ccd249e9d55e2e64f5bc5d9329ccdf
2020-02-20 15:11:45 +00:00
Automerger Merge Worker
769226c559 Simplify visibility rules that include //visibility:public am: 44885e29d6 am: bd51a99225
Change-Id: I6a32ef6d43c7af9a19c3ac17dd7af1db2f91b0b1
2020-02-20 14:56:23 +00:00
Automerger Merge Worker
bd51a99225 Simplify visibility rules that include //visibility:public am: 44885e29d6
Change-Id: Ia189b5486bc51b3b6a399f1cde66a2030c70c557
2020-02-20 14:46:10 +00:00
Nikita Ioffe
db10c13bdf For Q APEXes default target_sdk_version and min_sdk_version to 29
This will allow installing Q launched APEXes built from master on Q
devices.

Test: m com.android.conscrypt
Test: see another CL in topic
Test: lunch blueline-userdebug
Test: TARGET_BUILD_APPS=com.android.resolv m
Test: installed on Q blueline, verified installation succeeded
Bug: 149733822
Change-Id: Ia863b5701716ef4022b470ee758368ea4fffb1d4
2020-02-20 13:34:01 +00:00
Paul Duffin
44885e29d6 Simplify visibility rules that include //visibility:public
While it is invalid to mix //visibility:public with other rules in the
visibility property in a .bp file tt was possible, by overriding
defaults, to have //visibility:public mixed in with other rules in the
effective visibility rules. That caused problems when those effective
rules were used in an sdk snapshot.

This change replaces any set of rules that include //visibility:public
with just the //visibility:public rule. That simplifies those rules,
making them cheaper to process and ensures that the effective rules are
valid in the visibility property.

Adding test support required some refactoring of the
effectiveVisibilityRules(BaseModuleContext, ...) and underlying methods
to take a Config instead of BaseModuleContext as the tests do not have
access to BaseModuleContext.

Bug: 142935992
Test: m nothing - new tests failed without change, work with it
      Add dex2oat to art-module-host-exports, build it and check the
      generated Android.bp file in the snapshot to ensure the
	  visibility property for the dex2oat prebuilt does not mix
	  //visibility:public with other rules.
Change-Id: I08e7f0dcb40838d426fe88fedf69eae27b77473c
2020-02-20 11:41:17 +00:00
Chih-Hung Hsieh
5f78d55a0a Enable bitwise-conditional-parentheses warning
Bug: 148286937
Test: make
Change-Id: Ib793e35e1f3098e2cce760bcbf0f115ae5764c7f
Merged-In: Ib793e35e1f3098e2cce760bcbf0f115ae5764c7f
2020-02-20 00:58:41 -08:00
Automerger Merge Worker
b67fdeaca4 Add tests for py(2|3)-cmd am: 7fa7646ad7 am: 6ba26fc1e5 am: dad2be2bf7
Change-Id: I062f8a847cf846030461545633538e23ea95f284
2020-02-20 08:12:34 +00:00
Automerger Merge Worker
dad2be2bf7 Add tests for py(2|3)-cmd am: 7fa7646ad7 am: 6ba26fc1e5
Change-Id: Ic1314dbb558ba6358f44460cc06d62ea8979c061
2020-02-20 08:01:38 +00:00
Automerger Merge Worker
6ba26fc1e5 Add tests for py(2|3)-cmd am: 7fa7646ad7
Change-Id: If0b8aa08cdc3032bf85a56c34a6a6d763854c42b
2020-02-20 07:48:23 +00:00
Automerger Merge Worker
f5c529e8e1 Merge "Enable bitwise-conditional-parentheses warning" into qt-qpr1-dev-plus-aosp am: f62f162956
Change-Id: Ibb956a840d6c036dfeb10c3094309f3cdbd3af9b
2020-02-20 05:25:04 +00:00
Chih-hung Hsieh
f62f162956 Merge "Enable bitwise-conditional-parentheses warning" into qt-qpr1-dev-plus-aosp 2020-02-20 05:12:17 +00:00
Dan Willemsen
7fa7646ad7 Add tests for py(2|3)-cmd
Test: m par_test{,3} py{2,3}-cmd; ./runtest.sh
Change-Id: I4aadd9fc85be4381bd9a0843064ceaa87150b5ee
2020-02-19 19:40:38 -08:00
Colin Cross
ee87c60fc3 Add jni_uses_platform_api property to android_app
Add a jni_uses_platform_api property that will be used to allow
an app that builds against the SDK to use JNI libraries that build
against platform APIs.  For now it is a noop, but the next CL will
make it enforcing.

Bug: 149591057
Test: m checkbuild
Change-Id: Id7b7c8186bf0e28498a4cfb15c6a6ccc95df3679
2020-02-19 19:07:11 -08:00
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
7094cbc872 Merge "have a per-module switch to turn the symlinking optimizaiton off" am: eb9b9f23ec am: 67a0970d4f am: 279f6f1c80
Change-Id: Iae286618eb0206d7d9b0c40369048e5f38fb6084
2020-02-20 02:22:14 +00:00
Automerger Merge Worker
279f6f1c80 Merge "have a per-module switch to turn the symlinking optimizaiton off" am: eb9b9f23ec am: 67a0970d4f
Change-Id: Ic867f4a1b7f4d3e59bc67c94f0bd6c423ae9d490
2020-02-20 02:12:30 +00:00
Automerger Merge Worker
67a0970d4f Merge "have a per-module switch to turn the symlinking optimizaiton off" am: eb9b9f23ec
Change-Id: I4a4a321e0dffdfdd3b248d37198516c173dce833
2020-02-20 01:58:29 +00:00
Jiyong Park
eb9b9f23ec Merge "have a per-module switch to turn the symlinking optimizaiton off" 2020-02-20 01:47:57 +00:00
Automerger Merge Worker
5fa8df4b9c Merge "Automate dependency on inputs of genrule module type." am: 888d92e941 am: 7550d065da am: a3d2a64097
Change-Id: I4cf23e35a8c1a5408ebb4be0f0c4be587763ee38
2020-02-20 01:42:30 +00:00
Automerger Merge Worker
a3d2a64097 Merge "Automate dependency on inputs of genrule module type." am: 888d92e941 am: 7550d065da
Change-Id: I0f56b7be4f3ff9bae18c23ea610c098277503e3b
2020-02-20 01:31:42 +00:00
Automerger Merge Worker
7550d065da Merge "Automate dependency on inputs of genrule module type." am: 888d92e941
Change-Id: If72442eec40dfcaaf21a73ed6b3c461c9faef9f9
2020-02-20 01:19:28 +00:00