Commit Graph

20159 Commits

Author SHA1 Message Date
Automerger Merge Worker
c93ba028ea Merge "No symlink for host APEXes" into rvc-dev am: 73fa54e7a4
Change-Id: I8c02e7d52eadd32eb3f30514b3ab6f7c596a4919
2020-02-27 03:35:27 +00:00
Jiyong Park
73fa54e7a4 Merge "No symlink for host APEXes" into rvc-dev 2020-02-27 03:22:01 +00:00
Automerger Merge Worker
0167932768 Merge "In kzip files, compilation unit paths should be relative to top." am: 21321efc66 am: a5dfbff82f
Change-Id: Ie4ce06c629a436ea6f678e629d97cc5bcc052291
2020-02-26 21:51:08 +00:00
Automerger Merge Worker
a5dfbff82f Merge "In kzip files, compilation unit paths should be relative to top." am: 21321efc66
Change-Id: I762f3f7905ce7f8bcb5742942d40429ff4c6747f
2020-02-26 21:39:14 +00:00
Alexander Smundak
21321efc66 Merge "In kzip files, compilation unit paths should be relative to top." 2020-02-26 21:31:37 +00:00
Automerger Merge Worker
5a35861bc2 Merge "Unless overridden include LICENSE files in notices." am: 40017be1c3 am: c07a0cf902
Change-Id: Iccc43375a95c39898ca62d10d4bbe198f339ef9a
2020-02-26 21:01:45 +00:00
Automerger Merge Worker
c07a0cf902 Merge "Unless overridden include LICENSE files in notices." am: 40017be1c3
Change-Id: Idd0793baf0e6c18ed3bc1bd295a70228d6c553cd
2020-02-26 20:49:00 +00:00
Bob Badour
40017be1c3 Merge "Unless overridden include LICENSE files in notices." 2020-02-26 20:37:22 +00:00
Automerger Merge Worker
81b597b6ad Convert cc to AndroidMkEntries am: d80cbca76d am: 35189efd1d
Change-Id: Iab8e553dc23ff71b386165bae435b10262a4ef7f
2020-02-26 17:04:17 +00:00
Automerger Merge Worker
35189efd1d Convert cc to AndroidMkEntries am: d80cbca76d
Change-Id: I509d14736842b97489dc63c01ad0b0412124154c
2020-02-26 16:51:59 +00:00
Automerger Merge Worker
a3c8f2821e [automerger skipped] apex: do not follow jni_libs from android_app am: 650417966c -s ours
am skip reason: Change-Id Ifa1a6430a420ae7376b155cd59b8ece462cced7e with SHA-1 b7bebe2616 is in history

Change-Id: I93bbf4e0a9ad1973ab8ef034f5d74c5cb0b23569
2020-02-26 14:16:27 +00:00
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
Colin Cross
d80cbca76d Convert cc to AndroidMkEntries
Use AndroidMkEntries so the next patch can use ExtraFooters, which
doesn't exist in AndroidMkData.

Test: manually diff out/soong/Android.aosp_x86_64.mk
Change-Id: Ia3006b6747813693cf7e2b536030b21f3109f538
2020-02-25 19:53:04 -08:00
Automerger Merge Worker
4310865e88 [automerger skipped] Merge "Update ike.jar's name in code coverage configuration" into rvc-dev am: a519350860 -s ours
am skip reason: Change-Id Ic46a1091899eb5bc9560739ec86a9bea08585075 with SHA-1 2e5606736f is in history

Change-Id: Ib0ba7383f6476fc20c4ee763eca7b95034e0dd6a
2020-02-26 03:26:42 +00: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
Automerger Merge Worker
4d174673ae Merge "apex: do not follow jni_libs from android_app" am: 077f9a44f9 am: 52b4afe8f2
Change-Id: Ia392382fc787293cecd36c6456d1b2ec0af13877
2020-02-26 03:06:33 +00:00
Automerger Merge Worker
52b4afe8f2 Merge "apex: do not follow jni_libs from android_app" am: 077f9a44f9
Change-Id: Ibe282ebd930a6a53026eda08a6abb1bc28894fb5
2020-02-26 02:55:48 +00:00
Jooyung Han
077f9a44f9 Merge "apex: do not follow jni_libs from android_app" 2020-02-26 02:35:10 +00:00
Automerger Merge Worker
408483db04 Merge "Update ike.jar's name in code coverage configuration" am: 9a63ee1b4f am: 0c34e7e308
Change-Id: I7b707deb7b2e4914ea594aaa1b544c5fb4c4b059
2020-02-25 22:22:16 +00:00
Automerger Merge Worker
0c34e7e308 Merge "Update ike.jar's name in code coverage configuration" am: 9a63ee1b4f
Change-Id: I0484fed50a5b727c854e194fab2160315d07aca0
2020-02-25 22:04:10 +00:00
Yan Yan
9a63ee1b4f Merge "Update ike.jar's name in code coverage configuration" 2020-02-25 21:56:43 +00:00
Automerger Merge Worker
63ef2c3a28 Merge "Fix forwarding a vararg parameter" am: f3be200bcf am: f299645528
Change-Id: Ie3ce06bbfc3fda345e2b7837f05893448449897a
2020-02-25 20:26:29 +00:00
Automerger Merge Worker
f299645528 Merge "Fix forwarding a vararg parameter" am: f3be200bcf
Change-Id: I86b418711449eed67a543d190e0106f5f6784291
2020-02-25 20:16:57 +00:00
Treehugger Robot
f3be200bcf Merge "Fix forwarding a vararg parameter" 2020-02-25 20:06:53 +00:00
Sasha Smundak
b8f46cd2d6 In kzip files, compilation unit paths should be relative to top.
Fixes inter-module cross references.

Bug: 137798757
Test: build kzips, verify paths
Change-Id: I5cf64972ae61b869c96aafea5de0a48303d9af83
2020-02-25 11:22:17 -08:00
Jooyung Han
cd87c69de4 Fix forwarding a vararg parameter
vararg parameter is passed without unpacking, which prints
not-so-useful value.

Bug: N/A
Test: m
Change-Id: I03f011557d10c6e2bc06813491cd8df2cce7c6ea
2020-02-26 02:05:18 +09:00
Automerger Merge Worker
6fb054854f Merge "Add min_sdk_version property to apexes" am: 414d50c35d am: cca4f68ddf
Change-Id: Ia6a7ed104652bfe282d513e419da2f8d6a21a82c
2020-02-25 16:06:25 +00:00
Automerger Merge Worker
cca4f68ddf Merge "Add min_sdk_version property to apexes" am: 414d50c35d
Change-Id: I263f29ad9715077bb0de04aca318109ffd4b5ffd
2020-02-25 15:49:07 +00:00
Colin Cross
414d50c35d Merge "Add min_sdk_version property to apexes" 2020-02-25 15:34:26 +00:00
Jooyung Han
b7bebe2616 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

Change-Id: Ifa1a6430a420ae7376b155cd59b8ece462cced7e
2020-02-25 20:47:04 +09:00
Automerger Merge Worker
a05e233bc6 [automerger skipped] Expect added members for instrumented modules am: 2882660422 -s ours
am skip reason: Change-Id Ibaf383c439945ab664e885af319548b56e2c8cb6 with SHA-1 93e57a0b86 is in history

Change-Id: I28f056318c1b09b32dc3cb284392d44a1bf9e163
2020-02-25 11:44:40 +00:00
Automerger Merge Worker
ddd7dd3474 [automerger skipped] Reland "Turn on the instrumentation by default for the java code in APEXes" am: 81aaa0c1bd -s ours
am skip reason: Change-Id I2b1c0736202de26c5ea88c0ab14574bd7207a5fb with SHA-1 00cae1cc88 is in history

Change-Id: I4a742f7d0c08808acde978e2fb71e10bae935cf5
2020-02-25 11:44:38 +00: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
Automerger Merge Worker
7d94169f5e Merge "Add support for cc_library_headers in sdk/module_exports" am: e1fd6a9bd8 am: 92e2a41ea0
Change-Id: I449f2fca05d926f53732b074e9a20bf5f230db18
2020-02-25 10:53:46 +00:00
Automerger Merge Worker
5b62e17088 Merge "Prune any empty property sets from the modules before transforming" am: 78036c8afa am: 2482182b3b
Change-Id: Icfd28b46c6022f8ff73b7fb0862fb001eb70d534
2020-02-25 10:53:42 +00:00
Automerger Merge Worker
4b1fb4c567 Merge "Simplify cc library sdk snapshot handling of include dirs/headers" am: 2125138f25 am: 0f0bb62979
Change-Id: I458a012f73b34b7d183b553e7d777d94055790fd
2020-02-25 10:53:39 +00:00
Automerger Merge Worker
e4366eb21c Merge "Add support for transforming a property set after its contents" am: cbe936cc43 am: f8809f7dc6
Change-Id: I44d0ec67f8c0b60a3186d22de1d0b99d639da92d
2020-02-25 10:53:32 +00:00
Automerger Merge Worker
5d692f7eed Merge "Fix issues with bp transformation" am: e574be5c07 am: 2dd1518f4a
Change-Id: I4f8da2e40b9381e60e77ea4ca7cb7513257b7da2
2020-02-25 10:53:26 +00:00
Automerger Merge Worker
92e2a41ea0 Merge "Add support for cc_library_headers in sdk/module_exports" am: e1fd6a9bd8
Change-Id: I7bb61648a44cf3db37309a84da1f67c19a2beee4
2020-02-25 10:41:15 +00:00
Automerger Merge Worker
2482182b3b Merge "Prune any empty property sets from the modules before transforming" am: 78036c8afa
Change-Id: Ia8e8cd67d95c13811f8abb4971884dc7ac609dba
2020-02-25 10:41:10 +00:00
Automerger Merge Worker
0f0bb62979 Merge "Simplify cc library sdk snapshot handling of include dirs/headers" am: 2125138f25
Change-Id: I2ebff725f3053392d5393bff07b849de7fb76617
2020-02-25 10:41:04 +00:00
Automerger Merge Worker
f8809f7dc6 Merge "Add support for transforming a property set after its contents" am: cbe936cc43
Change-Id: I6d1d7dac0224e5d77ea1acb3a40b8870ea29bcca
2020-02-25 10:40:59 +00:00
Automerger Merge Worker
2dd1518f4a Merge "Fix issues with bp transformation" am: e574be5c07
Change-Id: Ib53635316c2a96b39668ac25b844a263f71506fe
2020-02-25 10:40:48 +00:00
Paul Duffin
e1fd6a9bd8 Merge "Add support for cc_library_headers in sdk/module_exports" 2020-02-25 10:29:39 +00:00
Paul Duffin
78036c8afa Merge "Prune any empty property sets from the modules before transforming" 2020-02-25 10:28:52 +00:00
Paul Duffin
2125138f25 Merge "Simplify cc library sdk snapshot handling of include dirs/headers" 2020-02-25 10:28:35 +00:00
Paul Duffin
cbe936cc43 Merge "Add support for transforming a property set after its contents" 2020-02-25 10:21:34 +00:00
Paul Duffin
e574be5c07 Merge "Fix issues with bp transformation" 2020-02-25 10:21:21 +00:00