Commit graph

20174 commits

Author SHA1 Message Date
Jiyong Park
9b96418dfe No symlink for host APEXes
Symlinking doesn't make sense for host APEXes.

Bug: 150255435
Test: m com.android.art.host and inspect the built APEX; there is
no symlink.

Change-Id: I28492dfaaef471117a430be05255fbef76e557b0
2020-02-26 18:27:19 +09:00
Jooyung Han
650417966c apex: do not follow jni_libs from android_app
Because APK-in-APEX embeds its jni_libs in it. We don't have to follow
deps of jni_libs.

Bug: 146992436
Test: m com.android.tethering
      deapexer extract com.android.tethering.apex apex
      ls apex # there should be no /lib dir

Merged-In: Ifa1a6430a420ae7376b155cd59b8ece462cced7e
Change-Id: Ifa1a6430a420ae7376b155cd59b8ece462cced7e
(cherry picked from commit b7bebe2616)
2020-02-26 14:10:23 +09:00
Yan Yan
a519350860 Merge "Update ike.jar's name in code coverage configuration" into rvc-dev 2020-02-26 03:09:17 +00:00
Alexander Dorokhine
c9c7116721 DO NOT MERGE: Remove AppSearch from Android R.
Test: presubmit
Bug: 150249538
Change-Id: I0a87b9d893bc76acf5ac5e8684f450b9a4f2a0cd
2020-02-25 17:16:41 -08:00
Jiyong Park
2882660422 Expect added members for instrumented modules
hiddenapi expects that all members in a class to have corresponding hidden
API flags. However, this can't be satisfied when the java module having
the class is instrumented; JaCoCo added a few number of synthetic
members. In this case, give 'no-force-assign-all' option to the hidden
api tool so that it doesn't complain about the synthetic methods.

Also, disabling instrumenting jacocoagent itself, because it doesn't
make sense.

Exempt-From-Owner-Approval: PS3 fixes a typo in a comment. PS2 got ORV.

Bug: 149353192
Test: SKIP_ABI_CHECKS=true EMMA_INSTRUMENT=true
EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true m
out/soong/.intermediates/external/apache-xml/apache-xml/android_common_com.android.art.debug/hiddenapi/unaligned/unaligned.jar
Merged-In: Ibaf383c439945ab664e885af319548b56e2c8cb6

(cherry picked from commit 93e57a0b86)
Change-Id: Ibaf383c439945ab664e885af319548b56e2c8cb6
2020-02-25 11:34:28 +00:00
Jiyong Park
81aaa0c1bd Reland "Turn on the instrumentation by default for the java code in APEXes"
This reverts commit c021ea0b35.

Exempt-From-Owner-Approval: cherry-pick from aosp

Bug: 149353192
Merged-In: I2b1c0736202de26c5ea88c0ab14574bd7207a5fb
Test: N/A (this is a clean revert) forward fix will be followed
(cherry picked from commit 00cae1cc88)
Change-Id: I2b1c0736202de26c5ea88c0ab14574bd7207a5fb
2020-02-25 11:34:09 +00:00
evitayan
996c18c78a Update ike.jar's name in code coverage configuration
ike has been renamed to android.net.ipsec.ike. This commit applies
this name updates to the code coverage configuration.

Bug: 148625578
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false android.net.ipsec.ike.com.android.ipsec_intermediates/ contains jacoco-report-classes.jar
Change-Id: Ic46a1091899eb5bc9560739ec86a9bea08585075
Merged-In: Ic46a1091899eb5bc9560739ec86a9bea08585075
(cherry picked from commit 2e5606736f)
2020-02-25 00:47:30 -08:00
Colin Cross
2ad2a7dfca Merge "Use header jar without jarjar for sharded classpath" 2020-02-21 22:27:01 +00:00
Automerger Merge Worker
aafbe3ab60 Merge "Allow Linux hosts to use ubsan runtime sanitizers." am: 61f7a24cea am: 10d46c9a54 am: d06e0974ce
Change-Id: I216706ee0a8fea5c496485784794006c562f0c42
2020-02-21 21:59:32 +00:00
Automerger Merge Worker
d06e0974ce Merge "Allow Linux hosts to use ubsan runtime sanitizers." am: 61f7a24cea am: 10d46c9a54
Change-Id: I9c8e62f0e60214af40420b530114d09c2fbef690
2020-02-21 21:42:05 +00:00
Automerger Merge Worker
10d46c9a54 Merge "Allow Linux hosts to use ubsan runtime sanitizers." am: 61f7a24cea
Change-Id: Iff7e990fe90dbcd1960eb8eab3120e90eda5514e
2020-02-21 21:23:24 +00:00
Ivan Lozano
61f7a24cea Merge "Allow Linux hosts to use ubsan runtime sanitizers." 2020-02-21 21:16:17 +00:00
Automerger Merge Worker
f9c738d084 Allow for setting a logging_parent for an Apex. am: 004d717158 am: f4fa3fe81e am: 833162725c
Change-Id: Ifa85d785453e5e363b4b374ce0ea1d12963cafbb
2020-02-21 18:05:12 +00:00
Automerger Merge Worker
833162725c Allow for setting a logging_parent for an Apex. am: 004d717158 am: f4fa3fe81e
Change-Id: I9b48680f2ab83b16d092bc8194d213643dc81a8c
2020-02-21 17:43:42 +00:00
Automerger Merge Worker
f4fa3fe81e Allow for setting a logging_parent for an Apex. am: 004d717158
Change-Id: I5b74fa459ba84c906a5d5060f90fba9ecc5898aa
2020-02-21 17:28:41 +00:00
Baligh Uddin
004d717158 Allow for setting a logging_parent for an Apex.
Test: go test ./... -test.v -run TestOverrideApex
BUG: 148198056
Change-Id: Ib3749e59f5e31903f2dbe75f86534738147a55ec
2020-02-21 16:59:26 +00:00
Colin Cross
f5a6628b27 Use header jar without jarjar for sharded classpath
Sharding uses the header jar of all of the classes of the module
with the sources of a subset, but was incorrectly used the jarjar
version of the header jar, which may have renamed some of the
classes.

Fixes: 149969343
Test: m framework-minus-apex
Change-Id: I568c939f8030d3ddc1e7fa8796cffcac4d6172e8
2020-02-21 08:16:41 -08:00
Automerger Merge Worker
7eaafe07cf Merge "Ensure consistent handling of generated headers/dirs" am: a0d58893fc am: 44242ee450 am: 4d54a5a580
Change-Id: I66ccacab3c2f411afdad5f91cd243b66ad519456
2020-02-21 09:06:19 +00:00
Automerger Merge Worker
15c8f35236 Merge "Do not add dependencies from disabled sdk variants to its members" am: 1c1c6ab46b am: 63f0e96c10 am: ad22da0dcb
Change-Id: I729e209bb9c4c67443697bd4d76053d391a1bca5
2020-02-21 09:06:05 +00:00
Automerger Merge Worker
4d54a5a580 Merge "Ensure consistent handling of generated headers/dirs" am: a0d58893fc am: 44242ee450
Change-Id: Ia79588237460b26927cfb09379ca9685741f317f
2020-02-21 08:51:51 +00:00
Automerger Merge Worker
ad22da0dcb Merge "Do not add dependencies from disabled sdk variants to its members" am: 1c1c6ab46b am: 63f0e96c10
Change-Id: I9fff6ffdda1d23a111159b4f7a17611943d854c4
2020-02-21 08:51:39 +00:00
Automerger Merge Worker
44242ee450 Merge "Ensure consistent handling of generated headers/dirs" am: a0d58893fc
Change-Id: I50b47f8244a9c3c432b499b2ef730932794a83e9
2020-02-21 08:34:35 +00:00
Automerger Merge Worker
63f0e96c10 Merge "Do not add dependencies from disabled sdk variants to its members" am: 1c1c6ab46b
Change-Id: I352ae417ed60378f205f9c2358e63699f512a27b
2020-02-21 08:34:25 +00:00
Treehugger Robot
a0d58893fc Merge "Ensure consistent handling of generated headers/dirs" 2020-02-21 08:19:33 +00:00
Treehugger Robot
1c1c6ab46b Merge "Do not add dependencies from disabled sdk variants to its members" 2020-02-21 08:18:25 +00:00
Automerger Merge Worker
150abfb64b Merge "Add jni_uses_platform_api property to android_app" am: 1a9be9f3d0 am: c40208d7e6 am: 9f3946121e
Change-Id: I1c0a71ec0a1bddc04ae48ecbc5e63d03e2686ec7
2020-02-21 07:42:47 +00:00
Automerger Merge Worker
9f3946121e Merge "Add jni_uses_platform_api property to android_app" am: 1a9be9f3d0 am: c40208d7e6
Change-Id: I17f612c055b12f6a8eb3ed89e2769ecb9c68de05
2020-02-21 07:26:51 +00:00
Automerger Merge Worker
c40208d7e6 Merge "Add jni_uses_platform_api property to android_app" am: 1a9be9f3d0
Change-Id: I7fad0b69e24c6017dbf8d09d027cc86ba8e49200
2020-02-21 07:10:08 +00:00
Colin Cross
1a9be9f3d0 Merge "Add jni_uses_platform_api property to android_app" 2020-02-21 06:58:48 +00:00
Automerger Merge Worker
7e83a01a1d Merge "Add static_libs field to target.vendor" am: 5c50e7f7c4 am: f789eab3c5 am: dc7dc18251
Change-Id: I398d0b8b2b66794b0fafba8688ba75f950ff1550
2020-02-21 04:38:44 +00:00
Automerger Merge Worker
dc7dc18251 Merge "Add static_libs field to target.vendor" am: 5c50e7f7c4 am: f789eab3c5
Change-Id: I9c8bd6dececba2e9d3b0c42a14ca0d94fcb6874b
2020-02-21 04:29:40 +00:00
Automerger Merge Worker
f789eab3c5 Merge "Add static_libs field to target.vendor" am: 5c50e7f7c4
Change-Id: I6afb4b56e82429280433ce436881a16e8822da07
2020-02-21 04:12:32 +00:00
Treehugger Robot
5c50e7f7c4 Merge "Add static_libs field to target.vendor" 2020-02-21 03:57:05 +00:00
Automerger Merge Worker
7db0d66e0f Merge "Add minijail to whitelist.go" am: 3f561c692d am: c4682b44de am: 60811a5d6a
Change-Id: I20b03e93b5fdcb70177739e70e0146607f94495a
2020-02-20 23:29:18 +00:00
Chong Zhang
ed5c14632a Add static_libs field to target.vendor
test: builds with a local Android.bp that uses target.vender.static_libs

Change-Id: Id1b70660ccab26025c280497916929d303d16aff
2020-02-20 15:21:38 -08:00
Automerger Merge Worker
60811a5d6a Merge "Add minijail to whitelist.go" am: 3f561c692d am: c4682b44de
Change-Id: I208704def4453c0412fb4c3c4ecccfb95e873644
2020-02-20 23:14:30 +00:00
Automerger Merge Worker
c4682b44de Merge "Add minijail to whitelist.go" am: 3f561c692d
Change-Id: Icb06d4ab05df230b59769ccec381215761924d38
2020-02-20 23:02:03 +00:00
Lingfeng Yang
3f561c692d Merge "Add minijail to whitelist.go" 2020-02-20 22:51:16 +00:00
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