Commit Graph

20911 Commits

Author SHA1 Message Date
Jiyong Park
f689b0ec7c Merge "Remove some apex_available whitelist" am: 1cda30e211 am: 41110b1cfb
Change-Id: Ieb597a084b56fbd3a18636f528e9fb1b6a963541
2020-04-01 13:36:05 +00:00
Jiyong Park
41110b1cfb Merge "Remove some apex_available whitelist" am: 1cda30e211
Change-Id: Icfccf9089fb669be2faee663b7d2516520e99eee
2020-04-01 13:18:27 +00:00
Artur Satayev
64651c3973 [automerger skipped] Merge "Use modular removed-dex.txt files for greylisting." into rvc-dev am: 0f9e77362c -s ours
am skip reason: Change-Id I4c8e6899fadfdfd1da82f6f453cc92e71aa9b78c with SHA-1 c7fb5c9964 is in history

Change-Id: I98f1857818d7170f5490ee622e62404c69745083
2020-04-01 13:15:11 +00:00
Artur Satayev
0f9e77362c Merge "Use modular removed-dex.txt files for greylisting." into rvc-dev 2020-04-01 13:07:41 +00:00
Jiyong Park
1cda30e211 Merge "Remove some apex_available whitelist" 2020-04-01 13:03:10 +00:00
Anton Hansson
7f0a0b8a2a [automerger skipped] Merge "Always keep rsp files" into rvc-dev am: cd4c32e556 -s ours
am skip reason: Change-Id I6fc25095442178c0bcbc1dea444ba51e9259c600 with SHA-1 6d3cad93e8 is in history

Change-Id: I69702e958e1ca512f234a7b3d253a02a6de437bf
2020-04-01 10:14:45 +00:00
Anton Hansson
cd4c32e556 Merge "Always keep rsp files" into rvc-dev 2020-04-01 09:53:02 +00:00
Dan Shi
7515af21bc [automerger skipped] Merge "Merge "Rename VTS to VTS10" am: 7182c45fe7 am: 4058983c0c am: 8989420fee am: 2d2a3643f5" into rvc-dev am: 91847d895d -s ours
am skip reason: Change-Id Iadad4ba96bf9a7f3b1d12c9d4eeb90fb1ed0841d with SHA-1 8989420fee is in history

Change-Id: If48707083d8bd1cba39b2572ab2142478b06fe4b
2020-04-01 04:46:44 +00:00
Dan Shi
91847d895d Merge "Merge "Rename VTS to VTS10" am: 7182c45fe7 am: 4058983c0c am: 8989420fee am: 2d2a3643f5" into rvc-dev 2020-04-01 04:31:32 +00:00
Hsin-Yi Chen
ee78794227 [automerger skipped] Merge "Fix the logic for selecting ABI dump paths" into rvc-dev am: 1422d6d13d -s ours
am skip reason: Change-Id Iad038cf4cd3eccc3dfbef13fab67da044498ce77 with SHA-1 27d235f918 is in history

Change-Id: I228962398436e4f3fd11667b8b38d767a80c9cb3
2020-04-01 04:15:32 +00:00
Hsin-Yi Chen
1422d6d13d Merge "Fix the logic for selecting ABI dump paths" into rvc-dev 2020-04-01 04:02:03 +00:00
Dan Shi
1a9a9127b1 Merge "Rename VTS to VTS10" am: 7182c45fe7 am: 4058983c0c am: 8989420fee am: 2d2a3643f5
Bug: 151896491
Test: none

Change-Id: Iee9324c4edefef56171ecfac64fd11a9595e5f7c
Merged-In: Iadad4ba96bf9a7f3b1d12c9d4eeb90fb1ed0841d
Merged-In: Iee9324c4edefef56171ecfac64fd11a9595e5f7c
(cherry picked from commit ee3ec387b0)
2020-03-31 23:20:53 +00:00
Dan Shi
8989420fee Merge "Rename VTS to VTS10" am: 7182c45fe7 am: 4058983c0c
Change-Id: Iadad4ba96bf9a7f3b1d12c9d4eeb90fb1ed0841d
2020-03-31 18:01:14 +00:00
Dan Shi
4058983c0c Merge "Rename VTS to VTS10" am: 7182c45fe7
Change-Id: I234463ef75233d4b4847f886b29a149d03f0a48b
2020-03-31 17:39:59 +00:00
Dan Shi
7182c45fe7 Merge "Rename VTS to VTS10" 2020-03-31 17:32:34 +00:00
Artur Satayev
a8ec55990f Use modular removed-dex.txt files for greylisting.
Use droidstubs for public and system stubs to provide a list of @removed APIs. As these APIs are not present in the stubs, they are not whitelisted / greylised automatically. Keep them on greylist manually.

Bug: 143864733
Test: diff out/soong/hiddenapi/hiddenapi-flags.csv
Change-Id: I4c8e6899fadfdfd1da82f6f453cc92e71aa9b78c
Merged-In: I4c8e6899fadfdfd1da82f6f453cc92e71aa9b78c
Exempt-From-Owner-Approval: clean cherry-pick
(cherry picked from commit c7fb5c9964)
2020-03-31 14:46:39 +00:00
Bill Peckham
0739dcaf61 Merge "Include partition tag in apexkeys.txt." am: 0ad0e940c0 am: 525a0d1648
Change-Id: I714cbb99d49d5e4f49e7a8a88ca1a2e400947fd6
2020-03-31 14:14:49 +00:00
Bill Peckham
525a0d1648 Merge "Include partition tag in apexkeys.txt." am: 0ad0e940c0
Change-Id: I9630f3144ff12073f9205619a32c3c57803581fd
2020-03-31 14:00:43 +00:00
Bill Peckham
0ad0e940c0 Merge "Include partition tag in apexkeys.txt." 2020-03-31 13:42:30 +00:00
satayev
aa3674af47 Merge "Use modular removed-dex.txt files for greylisting." am: b7f5c22ee4 am: 3bdd2d4dbd
Change-Id: Ic666d230457b2f3dde92c2c38a34b0657dd045f4
2020-03-31 12:54:49 +00:00
satayev
3bdd2d4dbd Merge "Use modular removed-dex.txt files for greylisting." am: b7f5c22ee4
Change-Id: I8f0e10b32bec4102c0bb565379c27d1a6630e9eb
2020-03-31 12:33:25 +00:00
satayev
b7f5c22ee4 Merge "Use modular removed-dex.txt files for greylisting." 2020-03-31 12:24:10 +00:00
Nicolas Geoffray
c4924713ff Merge "Update owners of build-aml-prebuilts.sh." am: 32e89ddb60 am: 9b7572faa8
Change-Id: I7f53aa4f573bdfa6dba60d93c9235b7370a4c9f4
2020-03-31 09:40:20 +00:00
Paul Duffin
87c5c6ea85 Merge "Add apex_available to sysprop_library" am: 545d958508 am: 2750b5b4c1
Change-Id: I3c122682a50c01026aea624a37c9f0b8d0b8f78b
2020-03-31 09:40:11 +00:00
Paul Duffin
2b31dbcc56 Merge "Improve missing apex_available message" am: 4db3298d34 am: b0725e7dd0
Change-Id: I22d65f68467dd0858361341da020b6e4866b7722
2020-03-31 09:40:05 +00:00
Paul Duffin
20f73b22a2 Merge "Split TestApexAvailable into separate tests" am: 33050c13c0 am: 20dbaf933b
Change-Id: I6da80e1b249f55a042f1f7f0d8dd97aafc823440
2020-03-31 09:39:54 +00:00
Nicolas Geoffray
9b7572faa8 Merge "Update owners of build-aml-prebuilts.sh." am: 32e89ddb60
Change-Id: If6d29859b1fe32387ca90f5e655ccebc61c86bed
2020-03-31 09:22:19 +00:00
Paul Duffin
2750b5b4c1 Merge "Add apex_available to sysprop_library" am: 545d958508
Change-Id: Ic488bfd1b3287055f71f53c93329550911de764f
2020-03-31 09:22:14 +00:00
Paul Duffin
b0725e7dd0 Merge "Improve missing apex_available message" am: 4db3298d34
Change-Id: Ic806d07d68037d2bc1e70a0a2300455a474eba6d
2020-03-31 09:22:10 +00:00
Paul Duffin
20dbaf933b Merge "Split TestApexAvailable into separate tests" am: 33050c13c0
Change-Id: Ie213446ddedf61234847cd7bbcb60cec545d53eb
2020-03-31 09:22:01 +00:00
Nicolas Geoffray
32e89ddb60 Merge "Update owners of build-aml-prebuilts.sh." 2020-03-31 09:08:35 +00:00
Paul Duffin
545d958508 Merge "Add apex_available to sysprop_library" 2020-03-31 09:06:58 +00:00
Paul Duffin
4db3298d34 Merge "Improve missing apex_available message" 2020-03-31 09:06:42 +00:00
Paul Duffin
33050c13c0 Merge "Split TestApexAvailable into separate tests" 2020-03-31 09:06:31 +00:00
Hsin-Yi Chen
afa4e4ba89 Merge "Fix the logic for selecting ABI dump paths" am: 74b2c7cb38 am: c5eaf3f03f
Change-Id: I78863cef1e10b2d35c2c8d44e225f6db59e75ef2
2020-03-31 03:13:20 +00:00
Hsin-Yi Chen
c5eaf3f03f Merge "Fix the logic for selecting ABI dump paths" am: 74b2c7cb38
Change-Id: I25a3769aa03264505ef29c3b80ee6ce79a80d7cf
2020-03-31 02:45:10 +00:00
Hsin-Yi Chen
74b2c7cb38 Merge "Fix the logic for selecting ABI dump paths" 2020-03-31 02:30:55 +00:00
Anton Hansson
918bff86c4 Merge "Convert sdk_library to use androidmk Dist" into rvc-dev am: b2ed9acc69
Change-Id: I27b2b6486d2e9b47bf9045a87ab29bcc0b472c3b
2020-03-30 23:36:00 +00:00
Anton Hansson
d2689082d8 Merge "Add a Tag field to dist to dist a tagged output" into rvc-dev am: 84dc13b8de
Change-Id: Ib17eba0f2c03ffe2c7db1da1df009007f5f77a7f
2020-03-30 23:35:45 +00:00
Anton Hansson
b2ed9acc69 Merge "Convert sdk_library to use androidmk Dist" into rvc-dev 2020-03-30 23:25:07 +00:00
Anton Hansson
84dc13b8de Merge "Add a Tag field to dist to dist a tagged output" into rvc-dev 2020-03-30 23:17:15 +00:00
Bill Peckham
fff3f8a3f8 Include partition tag in apexkeys.txt.
The partition tag helps merge_target_files.py determine
which apexkeys.txt to select from the framework partial
target files and which to select from the vendor partial
target files. The partition tag is the pysical partition
name, for example, a system_ext module on a device where
system_ext is at system/system_ext has a system
partition tag.

Bug: 138942268
Change-Id: Ia07887b34f1aa77dae94ef23610dfef83c1a5849
2020-03-30 22:33:50 +00:00
Paul Duffin
7b3de8f85b Add apex_available to sysprop_library
Added apex_available support to sysprop_library and copied it onto the
underlying cc_library.

Bug: 152762638
Test: m nothing
Change-Id: I8f4c539532b48f3a45c1fbf0f7287db11df69d2f
2020-03-30 18:43:39 +01:00
Paul Duffin
df915ff3db Improve missing apex_available message
The apex available check can traverse quite a long path (5+ steps) to
get from the apex to a module that is missing the apex from its
apex_available property. Understanding where that dependency came from
can often require examining the dependency path which can be difficult.
This change adds the path to the error to simplify that process.

Test: m nothing
Bug: 152762638
Change-Id: Ic4eb169dc2026cd8339d49e23b25d6d1c3879750
2020-03-30 18:43:39 +01:00
Paul Duffin
e52e66fba0 Split TestApexAvailable into separate tests
Having multiple tests within one method makes debugging specific
failures more difficult so this change split the TestApexAvailable
test into multiple separate tests.

Test: m nothing
Bug: 152762638
Change-Id: I2b2408ef515fd79c078686ef29a6ee8fb0407e7e
2020-03-30 18:43:39 +01:00
Artur Satayev
c7fb5c9964 Use modular removed-dex.txt files for greylisting.
Use droidstubs for public and system stubs to provide a list of @removed APIs. As these APIs are not present in the stubs, they are not whitelisted / greylised automatically. Keep them on greylist manually.

Bug: 143864733
Test: diff out/soong/hiddenapi/hiddenapi-flags.csv
Change-Id: I4c8e6899fadfdfd1da82f6f453cc92e71aa9b78c
2020-03-30 17:25:13 +01:00
Nicolas Geoffray
90934f7177 Update owners of build-aml-prebuilts.sh.
Test: N/A
Change-Id: Ie5be75f90be00db5adeaa40662e26a92c66d1b05
2020-03-30 14:23:13 +01:00
Anton Hansson
6bb8810c8e Convert sdk_library to use androidmk Dist
Reuse the generic Dist support instead of writing
custom mk rules for it. Use the new Tag support to
grab the classes.jar instead of the dexed jar.

Bug: 152618077
Test: m sdk dist
Change-Id: Id893d52cc24b66e6bd900b5062a59f3820000bcd
2020-03-30 14:22:43 +01:00
Anton Hansson
1e65f94a4b Add a Tag field to dist to dist a tagged output
Make java_library support this mode of output, to allow
callers to dist the classes.jar file rather than the dexed
jar file.

Bug: 152618077
Test: followup CL
Change-Id: I5ba6949833a0fbb95376142aec5096ff5f084c00
2020-03-30 13:55:32 +01:00
Jiyong Park
a0b7fdee67 Don't run apex_available check for coverage builds am: 58d1090032 am: 774baea1fc
Change-Id: I429a4e7edea72cdbb160d120ce85d921c185e9d7
2020-03-30 05:59:21 +00:00