Commit graph

1218 commits

Author SHA1 Message Date
TreeHugger Robot
208ad8b20d Merge "Clean up static_whitelist_patterns" into rvc-dev 2020-04-28 10:32:58 +00:00
Jeongik Cha
e1cee9a8df Clean up static_whitelist_patterns
$(HOST_OUT)/% is not necessary anymore.

Bug: 148993225
Test: m nothing
Change-Id: If2551283ebb6c516c029d1c04aebe25661bc6a1a
Merged-In: If2551283ebb6c516c029d1c04aebe25661bc6a1a
Merged-In: I7503c007c3e786b0cab26ea1422f0d4ba5a40662
2020-04-27 22:44:16 +00:00
Jeongik Cha
034cd871ae Extend static_whitelist_patterns
product-installed-files generates more default artifacts than
$(call module-installed-files,$(call auto-included-modules)),
and it causes problems when we try to apply this mechanism to other
partition

So use product-installed-files with an empty parameter as static
whitelist

Test: apply require-artifacts-in-path to other partition(or path),
      and then, m nothing
Test: add system module outside mainline_system.mk, and check if there is error.

Bug: 148993225
Change-Id: Ie110f20ff833229b23a777ff1decb32f84b9cef7
Merged-In: Ie110f20ff833229b23a777ff1decb32f84b9cef7
2020-04-26 16:29:46 +09:00
Dan Shi
5e7b3f429d Include shared host liraries in test suite zip
Bug: 151194160
Test: m -j vts && \
  ls out/host/linux-x86/vts/android-vts/testcases/lib64/
Change-Id: I7ebc4bf392d4c0f27478607846974631390097f8
Merged-In: I7ebc4bf392d4c0f27478607846974631390097f8
2020-04-15 06:24:49 +00:00
Automerger Merge Worker
aeca4e212e Move build number file to out/soong
Move the build number file to out/soong so Soong can treat it
as an output path, and pass the name of the file to Soong instead
of the command to read it.

Test: m checkbuild
Change-Id: I9e1aecf33d11fe4fde34cd57cc9b1f1ad49b0424
Bug: 153071808
Merged-In: I9e1aecf33d11fe4fde34cd57cc9b1f1ad49b0424
2020-04-09 08:15:37 -07:00
Anton Hansson
7dbf7dcb7b Add api xml files for new api surfaces
The coverage infra ingests these xml files to track
api coverage of APIs. Create files equivalent to the
existing files for the new API surfaces defined in R.

Bug: 152949797
Test: m dist && du -hs out/dist/*.xml
Change-Id: Id1914c34d1e9527964251b328179d20613a2d712
2020-04-01 14:36:28 +01:00
Orion Hodson
db651d5913 Update dex2oat filter
verify-at-runtime is deprecated in favor of extract. Update to
stop deprecation warnings during OTAs.

Bug: 149794809
Test: manual OTA
Change-Id: I9b8365a1fba5fd18420661a3e6ada77f3609bcc7
2020-03-26 15:04:29 +00:00
Yifan Hong
18f3e2d04b Merge "Build DEVICE manifests and fragments for each SKU" into rvc-dev 2020-03-11 18:44:36 +00:00
Roopesh Nataraja
202d4c8db4 Build DEVICE manifests and fragments for each SKU
Single vendor can support multiple skus with different
capabilities. Add support to define and build sku
based device manifests.

Specify DEVICE manifests in BoardConfig.mk as below.

  # installed to /vendor/etc/vintf/manifest_{sku}.xml
  DEVICE_MANIFEST_SKUS := sku1 sku2 sku3

  DEVICE_MANIFEST_SKU1_FILE := device/foo/bar/manifest_sku1.xml
  DEVICE_MANIFEST_SKU2_FILE := device/foo/bar/manifest_sku2.xml
  DEVICE_MANIFEST_SKU3_FILE := device/foo/bar/manifest_sku3.xml

Bug: 148601741

Change-Id: Id57d4ad21b0d3edf8d60d07446b6b806c1df20ab
Merged-In: Id57d4ad21b0d3edf8d60d07446b6b806c1df20ab
2020-03-10 12:22:31 -07:00
Bill Peckham
011255996c Don't touch .installable_files for non-FULL_BUILD
If we're not doing a full build, leave
$(PRODUCT_OUT)/.installable_files* alone rather
than truncating it. This prevents the clean logic
in Soong from removing everthing that we're trying
to use to build an image using the snod, vnod, etc.
goals.

Bug: 149460609
Test: make droid, make vnod, verify vendor.img
Change-Id: I612e32621b8045d085829507f22f6385b859f0c2
Merged-In: I612e32621b8045d085829507f22f6385b859f0c2
2020-03-05 11:20:33 -08:00
Automerger Merge Worker
dfa3d23969 Merge "Adding vendor_boot-debug.img" am: 31d4a5aed7 am: e1570cb99d am: a20bb6522a
Change-Id: Ic5ec4776d4daa91a1423b65d96e34026756ae9ad
2020-02-20 04:44:58 +00:00
Automerger Merge Worker
e1570cb99d Merge "Adding vendor_boot-debug.img" am: 31d4a5aed7
Change-Id: I48f3ded6c5c63aa9a828a529880f0cdb2918f8e2
2020-02-20 04:12:10 +00:00
Bowgo Tsai
6a68367e6e Adding vendor_boot-debug.img
Commit I30137c3caef91805d9143d404e5e4d06c0fccc30 adds boot-debug.img
to allow adb root with an user build GSI image.

  https://source.android.com/compatibility/vts/vts-on-gsi

Another commit I5b005097b73f59857c3a2f92d693b3e67ee8424e adds
vendor_boot.img to pair with a generic kernel image, the GKI boot.img.

To allow adb root for devices using a GKI, vendor_boot-debug.img is
introduced. The image combination used in VTS will be:

    Old devices without GKI:
      GSI system.img + boot-debug.img + vendor.img, etc.

    New devices with GKI:
      GSI system.img + GKI boot.img + vendor_boot-debug.img + vendor.img, etc.

Note that boot-debug.img still can be used on new devices for
non-compliance scenario.

Bug: 147849477
Test: lunch aosp_cf_x86_64_phone-userdebug; make vendorbootimage_debug
Test: `make dist`, checks that both vendor_boot-debug.img and
      vendor-ramdisk-debug.cpio.gz are in $OUT/ and out/dist.
Test: `make dist`, checks that installed-files-vendor-ramdisk-debug.{json,txt} are
       in $OUT/ and out/dist.
Change-Id: I66b662d8b1e5c619ed7bb81e40233fe9df363b27
2020-02-18 13:46:17 +08:00
Automerger Merge Worker
2f7d750a4e Merge "Remove unused no_vendor_variant_vndk_check target" am: 526551f013 am: 64d0b72f81 am: ad916eda39
Change-Id: Icbe22459d1cf5cbf45eae7d2e4561e5a55b52faa
2020-01-29 07:31:15 +00:00
Vic Yang
64d0b72f81 Merge "Remove unused no_vendor_variant_vndk_check target"
am: 526551f013

Change-Id: Id13c047df6da98ce0ab23b625c1578c2db2d3571
2020-01-28 23:04:41 -08:00
Vic Yang
3ec918d342 Remove unused no_vendor_variant_vndk_check target
This was missed when we moved from a single target for checking all
VNDK libraries to using timestamp files for checking individual VNDK
libraries.

Test: Build success.
Change-Id: I3be19f6755b24fff2446449a9dbc84db9a20ea41
2020-01-28 21:01:38 -08:00
Automerger Merge Worker
49f0e0283c Merge "Fix building docs as part of checkbuild" am: 35e12a7020 am: a8008259f9 am: 0550ae99a4
Change-Id: I1844b23cc9e31c8ea4f5d521cb621e824afc3c53
2020-01-28 23:07:48 +00:00
Colin Cross
a8008259f9 Merge "Fix building docs as part of checkbuild"
am: 35e12a7020

Change-Id: I6d3e445979e8d390841d24c01cbf37f8d6a20445
2020-01-28 14:46:48 -08:00
Colin Cross
43e74295e0 Fix building docs as part of checkbuild
s/module_to_check/modules_to_check/

Bug: 118815658
Test: m checkbuild
Change-Id: I53e10747ed404509fd11adb72e641c702e27655b
2020-01-27 11:36:07 -08:00
TreeHugger Robot
2f0743483b Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master 2020-01-16 18:29:25 +00:00
Automerger Merge Worker
1df6d79a0b Merge "device_(manifest|matrix).xml -> vendor_*" am: 2e4f20f540 am: fe1bb53543 am: 9a33bc10bc
Change-Id: I355ece2b39df76de7b82ba65805ea7cf561b7f75
2020-01-16 04:32:31 +00:00
Automerger Merge Worker
9a33bc10bc Merge "device_(manifest|matrix).xml -> vendor_*" am: 2e4f20f540 am: fe1bb53543
Change-Id: I07c65054fe5a569b557b10fb885c0efe735841a3
2020-01-16 04:23:03 +00:00
Yifan Hong
51be69f063 device_(manifest|matrix).xml -> vendor_*
Building device_manifest.xml or device_compatibility_matrix.xml only
builds vendor manifest / matrices, but not all device manifest /
matrices (e.g. vintf_fragments, ODM manifest, etc.). Make the name more
accurate.

Test: m check-vintf-all

Change-Id: Ib017507c421355263d53a9e5b357f169c77da36d
2020-01-14 14:24:51 -08:00
Automerger Merge Worker
bf4f7acb17 Merge "jacoco-report-classes-all.jar includes jar from other partitions" am: 3801c82e33 am: bf9e4cdd81 am: cccefb9901
Change-Id: I3b3f60fd7f81972c99198859b04fba76c6b336b8
2020-01-09 01:17:28 +00:00
Automerger Merge Worker
cccefb9901 Merge "jacoco-report-classes-all.jar includes jar from other partitions" am: 3801c82e33 am: bf9e4cdd81
Change-Id: I6adf59d2188289165034d7374fe50ad1f32dda54
2020-01-09 01:05:03 +00:00
Jiyong Park
bee946e8eb jacoco-report-classes-all.jar includes jar from other partitions
jacoco-report-classes-all.jar now depends on all installed files
including apks in /apex. Previously, it depended only on files under
system.img and as a result jacoco for other partitions were missing.

Bug: 147296855
Test: m

Change-Id: I755de1205ebc43c197af36a13cca5f4b49e275e8
2020-01-08 14:41:45 +09:00
Automerger Merge Worker
2c3d9c0171 Merge "Export list of "installable" files to soong_ui" am: 99202ec0a6 am: 8e080ccefe am: 3bbef8f744
Change-Id: I9c92904edc1da963a4711d523d565bfe3434229a
2020-01-04 05:46:02 +00:00
Automerger Merge Worker
3bbef8f744 Merge "Export list of "installable" files to soong_ui" am: 99202ec0a6 am: 8e080ccefe
Change-Id: I0dd6e68b91057d93f41c47da80749c7dbcb80aea
2020-01-04 05:34:11 +00:00
Dan Willemsen
dec6e8e056 Export list of "installable" files to soong_ui
These are a (partial) list of files that we'd install with a default
build. The idea is that if something is removed from this list, soong_ui
can remove it from the installed location before running ninja.

It's okay if there are things missing from this list, it's not intended
to be a 100% solution replacing installclean / CleanSpec.mk, just
something that handles 80% of the cases without user involvement.

In particular, if something is removed from PRODUCT_PACKAGES, we'll
remove it from disk, but not necessarily rebuild the image files. That's
the same as most use cases of CleanSpec.mk today, and often some other
change will trigger the necessary images to be rebuilt.

We should be able to fix that by changing all of the image creation
rules to depend on the (partial) list of files they care about, or by
fixing ninja to rebuild things when their list of dependencies change.
(Other tools run into this same problem)

The list of test files is also included so that we can remove obsolete
tests from their "installed" locations within test suites and the
testcases folders.

Test: remove a module from PRODUCT_PACKAGES, see the print and file removed
Test: change the name of a cts test, see the old one removed from cts
Change-Id: I67f270a6713369099ca523aaf991ee3beb815c0a
2020-01-03 19:19:11 -08:00
TreeHugger Robot
1abdc0a391 Merge "Re-enable link type checking" 2020-01-02 18:04:20 +00:00
Automerger Merge Worker
726f056d22 Merge "Define ro.product.vndk.version" am: e8139b905d am: a126b69335 am: 4bce5b4f4b
Change-Id: I4069c767e082a961ee456f2fd0f01a6c922c2f3b
2019-12-25 09:32:21 +00:00
Automerger Merge Worker
4bce5b4f4b Merge "Define ro.product.vndk.version" am: e8139b905d am: a126b69335
Change-Id: If7676e80733b8a4a6b4e958a20f8e9d9e3fcf322
2019-12-25 09:15:53 +00:00
Justin Yun
04e5a40f2c Define ro.product.vndk.version
Use ro.product.vndk.version to show the VNDK version that the product
partition is using.
When PRODUCT_PRODUCT_VNDK_VERSION is set, add ro.product.vndk.version
in /product/build.prop.
If PRODUCT_PRODUCT_VNDK_VERSION is "current", ro.product.vndk.version
will have the VNDK version in PLATFORM_VNDK_VERSION. Otherwise, it
will have the value defined in PRODUCT_PRODUCT_VNDK_VERSION.

Bug: 144534640
Test: Check if /product/build.prop has "ro.product.vndk.version"
Change-Id: If5e7e3a6c155de45f88f68700f16175656896afe
2019-12-24 07:20:43 +00:00
Automerger Merge Worker
20e8d991d2 Merge "Only dist recovery_ramdisk if BOARD_USES_RECOVERY_AS_BOOT" am: 9de27595ec am: de2634bdf0 am: 3648df452f
Change-Id: I55f1d00a8bafd87b06336749de4e3a21c43bd307
2019-12-24 00:26:15 +00:00
Automerger Merge Worker
3648df452f Merge "Only dist recovery_ramdisk if BOARD_USES_RECOVERY_AS_BOOT" am: 9de27595ec am: de2634bdf0
Change-Id: I9a2d2b6be6992423ae1f8b2117af616dd5b74cce
2019-12-24 00:14:27 +00:00
Daniel Mentz
5a8feb5422 Only dist recovery_ramdisk if BOARD_USES_RECOVERY_AS_BOOT
Bug: 146798070
Change-Id: I9e9d313b8ca097b4930fc2c99800772c6bdcbb9e
2019-12-23 14:08:31 -08:00
Automerger Merge Worker
ff7c844f4b Merge "Dist ramdisk-recovery.img and misc_info.txt" am: b581214e65 am: aa64af5c71 am: 3ff4bb8205
Change-Id: I23e989b93cccf809dac3fcf0d5c64598543234eb
2019-12-23 19:05:44 +00:00
Automerger Merge Worker
3ff4bb8205 Merge "Dist ramdisk-recovery.img and misc_info.txt" am: b581214e65 am: aa64af5c71
Change-Id: I3002e62d53c4d21d3dcc26269583782048a1a047
2019-12-23 18:53:38 +00:00
Daniel Mentz
4d6017d519 Dist ramdisk-recovery.img and misc_info.txt
Dist ramdisk-recovery.img and misc_info.txt. This is useful for
re-creating boot.img without having to download a huge target_files zip
file.

Change-Id: I2e1c1d547c95ca3433f89c68428c0c98fa4d19cd
2019-12-23 18:35:17 +00:00
Automerger Merge Worker
5a074943e8 Merge changes from topic "runtime_apex_available" am: 982da2812f am: 2320db6261 am: 069bb10478
Change-Id: I7526e2356d3d7f0c01644600c2e89f43c83ac6f5
2019-12-23 05:20:44 +00:00
Automerger Merge Worker
069bb10478 Merge changes from topic "runtime_apex_available" am: 982da2812f am: 2320db6261
Change-Id: I99a596b5c6d0393d6976c7231b49a4ef3b67b4cf
2019-12-23 05:06:42 +00:00
Jiyong Park
22195346dd apex-libs-absence checks are removed
The check is implemented in Soong via the apex_available property.
For a module that should be in the APEX named "foo" and shouldn't be in
any other APEX and also in the platform (the non-updatable part), the
property can be set to "foo" (without "//apex_available:platform")
to express the restriction and then Soong will enforce it.

Bug: 128708192
Test: m
Change-Id: Ia1aaaacd685f466447b61deae2849cb0aa83def3
2019-12-23 03:41:59 +00:00
Jiyong Park
be77c453a7 Remove bionic libs from APEX_MODULE_LIBS check
The test was to ensure that bionic libs are not installed to the
non-updatable part of the platform (e.g. system/lib). However, for
bionic libs, we actually have been installing them for bootstrapping.
Specifically, they are installed to /system/lib/bootstrap, not
/system/lib. The test has passed just because it didn't look into
/system/lib/bootstrap. Removing the unnecessary check.

Bug: 128708192
Bug: 133140750
Test: m
Test: m out/target/prduct/$(TARGET_DEVICE)/system/lib/libc.so doesn't
work
Change-Id: I93cbd74972cdd2daea45612136d5133fa49ab76a
2019-12-22 12:25:48 +09:00
Automerger Merge Worker
d37e7a8dfa Merge "Use apex_available property" am: 8029967a99 am: d030761781 am: b84f1489a2
Change-Id: Iea55e4d5e2aa796a485253f95d5dd9496461e1af
2019-12-20 07:17:39 +00:00
Automerger Merge Worker
b84f1489a2 Merge "Use apex_available property" am: 8029967a99 am: d030761781
Change-Id: I980478ff17779ac10f1dbbce26eedb7e69b8c9d1
2019-12-20 07:05:46 +00:00
Jiyong Park
be2aed5529 Use apex_available property
Use apex_available property to prevent modules that are only for the
NN apex from being used outside of the APEX.

Bug: 128708192
Bug: 133140750
Test: m
Change-Id: I57fe857d99088ef08e065dd2a3fc5a9389b6eb0f
2019-12-20 13:18:27 +09:00
Jiyong Park
a4226d1942 Use apex_available property
Use apex_available property to prevent modules that are only for the
conscrypt apex from being used outside of the APEX.

Bug: 128708192
Bug: 133140750
Test: m
Change-Id: I08ca6cd8e5e4a254d9dd62695ee3ed317503d874
2019-12-20 13:13:50 +09:00
Automerger Merge Worker
0777057f99 Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR am: f8b8c647e4 am: fc07c41a9e am: 2b6fdb3dab
Change-Id: I074ce6dedf034a2ce9c51796906926778b1b0007
2019-12-20 02:29:00 +00:00
Automerger Merge Worker
2b6fdb3dab Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR am: f8b8c647e4 am: fc07c41a9e
Change-Id: I87209392968251e9c7131be858fc1b580ee60e30
2019-12-20 01:42:59 +00:00
Jiyong Park
f8b8c647e4 Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR
Reason for revert: relanding with fix
Reverted Changes:
Ic4119368c:Revert submission 1191937-art_apex_available
Ia084976bb:Revert submission 1191937-art_apex_available
Iada86226d:Revert submission 1191937-art_apex_available
Ic76735eac:Revert submission 1191937-art_apex_available
I1eb30e355:Revert submission 1191937-art_apex_available
Icaf95d260:Revert submission 1191937-art_apex_available
Ie8bace4be:Revert submission 1191937-art_apex_available
I8961702cf:Revert submission 1191937-art_apex_available
I39316f9ef:Revert submission 1191937-art_apex_available
I522a7e83b:Revert submission 1191937-art_apex_available
I8b9424976:Revert submission 1191937-art_apex_available
I48b998629:Revert submission 1191937-art_apex_available

Change-Id: I8b4eed03c76153e2469f7b3e2e33c6e20e6e0409
2019-12-19 18:16:34 +09:00