Commit Graph

20136 Commits

Author SHA1 Message Date
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
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
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
evitayan
2e5606736f 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
2020-02-25 07:43:43 +00:00
Automerger Merge Worker
94124eeb11 Merge changes Ibaf383c4,I2b1c0736 am: 139fa4320f am: e45d4d1612
Change-Id: Iba51fa72f9232cd5ce9826550fc7b2072280fad4
2020-02-25 07:28:33 +00:00
Automerger Merge Worker
e45d4d1612 Merge changes Ibaf383c4,I2b1c0736 am: 139fa4320f
Change-Id: I71377d3a6e5395732aee75e3e129d3684b523c13
2020-02-25 07:15:26 +00:00
Jiyong Park
139fa4320f Merge changes Ibaf383c4,I2b1c0736
* changes:
  Expect added members for instrumented modules
  Reland "Turn on the instrumentation by default for the java code in APEXes"
2020-02-25 07:02:33 +00:00
Jiyong Park
93e57a0b86 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
Change-Id: Ibaf383c439945ab664e885af319548b56e2c8cb6
2020-02-25 07:01:18 +00:00
Automerger Merge Worker
c990ac9e8e Merge changes Idd50ed38,Icbc86b21 am: 4483601b58 am: 3c025bf921
Change-Id: I266e580ff456d6d25b82e45693faa3e930d277fc
2020-02-25 04:21:20 +00:00
Automerger Merge Worker
89ea84d797 Merge "Merge CSV files generated by UnsupportedAppUsageProcessor." am: a35e3ffd96 am: a00f6b6500
Change-Id: I17dfa8c58c0f0442b226daecae781adc4a9c90df
2020-02-25 04:21:11 +00:00
Automerger Merge Worker
3c025bf921 Merge changes Idd50ed38,Icbc86b21 am: 4483601b58
Change-Id: I314ea3ce0626bc3db15ac5b5caadbcd276428365
2020-02-25 04:09:28 +00:00
Automerger Merge Worker
a00f6b6500 Merge "Merge CSV files generated by UnsupportedAppUsageProcessor." am: a35e3ffd96
Change-Id: I68d7f414762f2a480346eddc0c68ed6bbfaf92a0
2020-02-25 04:09:21 +00:00
Treehugger Robot
4483601b58 Merge changes Idd50ed38,Icbc86b21
* changes:
  Add cc_prebuilt_library_headers
  Separate cc_library_headers to its own file and add tests
2020-02-25 04:05:16 +00:00
Treehugger Robot
a35e3ffd96 Merge "Merge CSV files generated by UnsupportedAppUsageProcessor." 2020-02-25 04:01:52 +00:00
Automerger Merge Worker
15b7ba08ce Merge "Output json without trailing whitespaces but with trailing newlines." am: 65b5b59664 am: 79cdcc07db
Change-Id: I7ae2a2acd0104fc371a22e261d679d64b2300449
2020-02-25 00:46:29 +00:00
Automerger Merge Worker
98377c6a74 Merge "Require apps built against the SDK to use JNI built against the NDK" am: 48c2f294a6 am: ec3f52684e
Change-Id: I73fbc7aca1ed2a9452b78d061f00178c44e3bc68
2020-02-25 00:46:18 +00:00
Automerger Merge Worker
79cdcc07db Merge "Output json without trailing whitespaces but with trailing newlines." am: 65b5b59664
Change-Id: I4640dc70d62c51caa96c4e563866f35d125a7683
2020-02-25 00:41:28 +00:00
Treehugger Robot
65b5b59664 Merge "Output json without trailing whitespaces but with trailing newlines." 2020-02-25 00:39:23 +00:00
Automerger Merge Worker
ec3f52684e Merge "Require apps built against the SDK to use JNI built against the NDK" am: 48c2f294a6
Change-Id: I5f07647df61b60e70246fca49cff02f44d5a2dd6
2020-02-25 00:35:20 +00:00
Colin Cross
48c2f294a6 Merge "Require apps built against the SDK to use JNI built against the NDK" 2020-02-25 00:21:07 +00:00
Martin Stjernholm
37fa32ce94 Output json without trailing whitespaces but with trailing newlines.
Makes them more editor friendly, primarily when copied into
system/linkerconfig/testdata/root.

Test: m
Test: No diff between apex_manifest_full.json in out/
  and in linkerconfig/testdata/root/
Bug: 140599044
Change-Id: I6dacdd4baa59e6d70586c4a6343b9b8fd1b574f6
2020-02-24 22:20:49 +00:00
Paul Duffin
91756d2498 Add support for cc_library_headers in sdk/module_exports
Bug: 148933848
Test: m nothing
Change-Id: Ife6ee0f736238727a11b4421532eaeb29d46c1b7
2020-02-24 14:49:22 +00:00
Paul Duffin
a78f3a7360 Prune any empty property sets from the modules before transforming
Ensures that the generated prebuilt modules do not contain empty
property sets.

Bug: 148933848
Test: m nothing
Change-Id: I99d5da1c4e3a72836e81e021ef043df53888e66b
2020-02-24 14:49:22 +00:00
Paul Duffin
64f54b0ae8 Simplify cc library sdk snapshot handling of include dirs/headers
Previously, the code for generating a snapshot of a cc library was
split into two separate phases. The first phase copied the files that
needed copying and the second phase added the properties for the
include dirs. This separation made it difficult to make sure that the
two phases were in sync.

This change merges those two phases together so the same paths used to
copy the files are used in the properties ensuring consistency. As the
various type of include dir and header were treated slightly different
to each other this parameterizes that behavior.

Bug: 142935992
Test: m nothing
Change-Id: I7877464987bbdae9662e5e3f02bb5e5a75dca5a3
2020-02-24 14:49:22 +00:00