Commit graph

20067 commits

Author SHA1 Message Date
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
Bill Peckham
888d92e941 Merge "Automate dependency on inputs of genrule module type." 2020-02-20 01:06:00 +00: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
Automerger Merge Worker
ddf8057250 Merge "Permissions XML file for java_sdk_library is mutated for APEX" am: 2d6d5d8995 am: dcf5cfaea5 am: ba87e454cb
Change-Id: If143ba1b41e7374d2c92e91c5a5906370ce1f6c4
2020-02-20 00:50:53 +00:00
Automerger Merge Worker
5fc19eecee Merge "Fix .vendor suffix for snapshots" am: 578b7ac691 am: 0a431d17b6
Change-Id: Id7e7a0caf72369dddb9a17490781db6829b3b545
2020-02-20 00:40:49 +00:00
Automerger Merge Worker
b2742ef1c1 Merge "Do not hide VNDK prebuilts from make" am: 07f37120e5 am: 9a99c6f5e7
Change-Id: Iffdd1303132111d0e55d1a4e07ed2d90c6cc069b
2020-02-20 00:40:42 +00:00
Automerger Merge Worker
e8bba597dd Merge "Fix build error on vendor_snapshot_static" am: 5b37383464 am: 93fc33c215
Change-Id: I517e4309a6e095fd0aa6834b172e2f07f55f2022
2020-02-20 00:40:09 +00:00
Automerger Merge Worker
5c260af50b Merge "Fix header deps of sysprop_library" am: 0298d036e9 am: 2009aa299b
Change-Id: I5fb099af5023c7ff762baf9fd5706a34e369c32f
2020-02-20 00:39:40 +00:00
Automerger Merge Worker
ba87e454cb Merge "Permissions XML file for java_sdk_library is mutated for APEX" am: 2d6d5d8995 am: dcf5cfaea5
Change-Id: I2298515b08618ae314e72866c0deb412d16746f1
2020-02-20 00:38:49 +00:00
Automerger Merge Worker
0a431d17b6 Merge "Fix .vendor suffix for snapshots" am: 578b7ac691
Change-Id: Ie30a11a2706538f3ca70df940efa48410ba81f81
2020-02-20 00:25:17 +00:00
Automerger Merge Worker
9a99c6f5e7 Merge "Do not hide VNDK prebuilts from make" am: 07f37120e5
Change-Id: I35cbeaeaa2bdd910cd6578f54dd075a4baa81c0d
2020-02-20 00:24:43 +00:00
Automerger Merge Worker
93fc33c215 Merge "Fix build error on vendor_snapshot_static" am: 5b37383464
Change-Id: I305f84bcc4f6b4a306447610b59f2589b332f0cc
2020-02-20 00:24:13 +00:00
Automerger Merge Worker
2009aa299b Merge "Fix header deps of sysprop_library" am: 0298d036e9
Change-Id: I5a4c78fbc6a7e9be227f24d8e481e9d6dc6fae1c
2020-02-20 00:23:44 +00:00
Automerger Merge Worker
dcf5cfaea5 Merge "Permissions XML file for java_sdk_library is mutated for APEX" am: 2d6d5d8995
Change-Id: I8bc80e0fb2f21707685ea4ffcd5f26ee58c629db
2020-02-20 00:22:00 +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