The SdkSetup apk is included by AOSP images and it should not
refers to google apks.
We need to figure out different way to fix the original GTS failure.
BUG: 62292257
This reverts commit fb743d8db6e755e98251e6509a09aed6d51f76d4.
(cherry picked from commit 03f4e91d52fbd994e0c11ddf537ad767e8c14bde)
Change-Id: I87c4dcefc6b51890d4edcd2749eee2fbdb7fc8a0
The new version produces api-versions.xml file with API removal
information. The format of the file is backward compatible.
Test: api-generator was tested as part of ag/2298689
Bug: 37127307
Change-Id: I0db84363b973a2c6076dcb42033a09a5566ff9f1
(cherry picked from commit 1c6c892938)
(cherry picked from commit a9bb8f2687f7c879be8b2bacf420e6e116ca245b)
This places apksigner command-line tool in Android SDK's build-tools
directory. The tool is intended as an Android-specific replacement for jarsigner.
Bug: 62696222
Change-Id: I099ea6840d0e7e0b00f438357543cb656990442a
(cherry picked from commit a825e5d309629b2f9cb3b52ba6d9895562729001)
This commit fixes a check-dep bug introduced by 7e723126e4. In
7e723126e4, graph.lib_pt[PT_VENDOR].values() was changed to return an
iterator instead of a set. This means we can only traverse the iterator
once, thus vendor-to-vendor dependencies were treated as ineligible
dependencies. This commit fixes the problem by creating a set() object
from the iterator, so that `vendor_libs` can be used several times.
This also makes it faster to lookup an object.
Bug: 37867089
Test: Run `vndk_definition_tool.py check-dep` against sailfish images
and vendor-to-vendor dependencies should not show up.
Merged-In: I3b36efa635220941278c491b83f308a65e9f0ffe
(cherry picked from commit ba097bb576)
Change-Id: I056ef0f9b5ddf684417cc080e53c0e4f07417496
This commit generalizes tag file support so that deps-insight won't
follow the dependencies to ineligible vndk-sp/vndk libs.
Bug: 37867089
Test: libandroid.so will not be tagged as vndk in the html output of
deps-insight tool.
Merged-In: I5482a45acf4232ae7fac1210043ca868b28211ff
(cherry picked from commit 7a8bc4db10)
Change-Id: I282c78274d520d150cf8b8684ccd729b2a499273
This commit adds the --output-format option to vndk command. When
`make` is specified, VNDK definition tool will fill in the placeholders
in the boilerplates and print a make file to stdout.
Bug: 37867089
Test: ./vndk_definition_tool.py vndk --output-format=make ...
Merged-In: I0185e1690264d0cefafa8536db2e0cf34daaeee0
(cherry picked from commit 5ad8d0fe74)
Change-Id: Icb15870b7cd1ef6bb6ab71735ea60230a1b517f1
This commit adds extra_vendor_libs and removes extra_vndk_sp_indirect.
With this modification, we can tag each libraries with either vndk_ext,
extra_vendor_libs, vndk_sp_ext or vndk_sp_indirect_ext.
After tagging them precisely, we merge them into vndk_sp, vndk_sp_ext
and extra_vendor_libs before printing the simplified VNDK list. This
will give us accurate tags when --full is specified and give concise
tags when --full is not specified.
Bug: 37867089
Test: 3 essential sets are printed when --full was not specified.
Merged-In: Ic17c5e1dd4420050217e9724f86516c21609f899
(cherry picked from commit b68f26d281)
Change-Id: I558e2a01c46d28a1bdb368a73d0b2e0cbd4cc357
This commit removes `follow` option from the default actions to handle
ineligible vndk and vndk-sp usages. We prefer to stop at ineligible
libs instead of pulling all ineligible dependencies.
Bug: 37867089
Test: libandroid.so is not tagged as vndk by default with sailfish images.
Merged-In: Iafeb27bb2c658fc07916517033fbedcc9cdd84eb
(cherry picked from commit 8e208817a3)
Change-Id: I27c90831439978290f9ab77fdbff3ab591443c73
This commit adds libz.so back to LL-NDK because the change to move
libz.so to VNDK-SP breaks some CTS testcases (which assume there is only
one libz.so under /system/lib[64].)
Whether this is a short-term temporary fix or a long-term solution will
be discussed or updated in b/37617391.
Bug: 62195853
Bug: 37867089
Bug: 37617391
Test: ./tests/test_ndk_libs.py
Test: ./tests/run.py
Test: libz.so tagged as LL-NDK with sailfish images.
Merged-In: I526f653e6141d658ee19e79eefd44d379ecac0dc
(cherry picked from commit 1715340334)
Change-Id: I74b0e9ef1d6a09c7d71744003a5ecf21111d34dd
This commit implements the VNDK-SP-Ext properly so that the output will
copy missing VNDK-SP-Indirect to /vendor/lib[64]/vndk-sp.
Bug: 37867089
Bug: 37940694
Test: Add/remove generic reference dump and make sure vndk-sp libs will
be listed as extra_vndk_sp_indirect.
Merged-In: I76bc41e189e566c66c6f96db9555d366921b7995
(cherry picked from commit 489dabb278)
Change-Id: Ief1cc42f6d1684879b096b3fc49f7f58fdfa4004
This commit collects all non-AOSP system libraries that are used by
vendor modules and add them to vndk-ext so that they are copied into
vendor partition.
Bug: 37867089
Test: Some vendor HIDL interface libs are tagged with vndk-ext given
sailfish images.
Merged-In: I77d8f66d97b403991593d5b1f88573411e96d679
(cherry picked from commit 6a2fcac08d)
Change-Id: Ifbb69fb7c580a7ef7ea7180af9c37d6255d244f9
This commit excludes vndk-sp libraries from vndk result sets. This CL
eliminates several false warnings on vendor usages on libhwbinder.so
Bug: 37867089
Test: Warnings on libhwbinder.so usages disappeared given sailfish
images.
Merged-In: Icc3b07bc6a57e41a3fcbaf116c1316f77e7a439d
(cherry picked from commit 89015efb13)
Change-Id: I94b5b6851955cb3063aa9092f79facf666b043fc
This commit removes vndk-sp-indirect libs from vndk-sp-unused. They
are actually being used (although indirectly).
Bug: 37867089
Test: libhwbinder.so is removed from vndk-sp-unused given sailfish images.
Merged-In: I7a3b253408c53f1d81d1fea39f79e3fe09f6fb75
(cherry picked from commit 55a41a3dd9)
Change-Id: I58df815bee640d79f2080b78ff133c5b670d8f15
This commit adds (?:vndk-sp)? to FWK-ONLY-RS matching because some
targets have a copy of libft2.so in /system/lib[64]/vndk-sp but we still
want to treat it as FWK-ONLY-RS.
Bug: 37867089
Test: libft2.so is not labeled as vndk-sp-indirect in sailfish image.
Merged-In: Iad5db6417573f3e25bad5c027cb547d9df4be23a
(cherry picked from commit 6582daf969)
Change-Id: I2a6c9741444739d56d0db00792f2bc4ffd417125
This commit excludes VNDK-SP and VNDK libs from LL-NDK-INDIRECT and
SP-NDK-INDIRECT libs because in the degenerated VNDK design, FWK-ONLY
libs and VNDK libs share the same file.
Bug: 37867089
Test: All eligible VNDK libs are not tagged with LL-NDK-Indirect and
SP-NDK-Indirect with sailfish image.
Merged-In: I05b20e9d21543d63c1e75896f20e49c3dc0d70de
(cherry picked from commit 05a13ae43f)
Change-Id: Ia74e1a692fda996f37c6d3ee769a05f7ab0f6fcf
This commit extracts the code to parse the action when ineligible
vndk-sp or vndk libs occur.
Bug: 37867089
Test: All --action-ineligible-vndk-sp options worked as usual.
Test: All --action-ineligible-vndk options worked as usual.
Merged-In: Ifc06598b1acff828479d804323711ae0da6e7215
(cherry picked from commit 2a5a2dd524)
Change-Id: I6af5b7512ef809753b6e3d9ff36a77f2711b116a
This commit replaces a vndk_indirect with vndk because we are computing
the indirect dependencies of vndk (i.e. closure(vndk) - vndk).
Bug: 37867089
Test: vndk-indirect libs are printed with sailfish images.
Merged-In: I218333c7dbb2a372cc9d170f34674510cc01aa0e
(cherry picked from commit 484219c317)
Change-Id: Ia0de1bf599e4be27a4324a09abf9653a5a50dea4