Commit Graph

24213 Commits

Author SHA1 Message Date
TreeHugger Robot
b1e99dd0a1 Merge "Don't check link type of Soong app JNI libraries" into rvc-dev 2020-05-16 01:15:56 +00:00
Treehugger Robot
43a1f47168 Merge "vendor_boot: remove INTERNAL_MKBOOTIMG_VERSION_ARGS from mkbootimg args" am: ff58fe4874 am: 3e7dadb73b
Change-Id: Iedc7d3106ef877936075731d6559a6b0fc0fbfb0
2020-05-16 00:46:11 +00:00
Treehugger Robot
ff58fe4874 Merge "vendor_boot: remove INTERNAL_MKBOOTIMG_VERSION_ARGS from mkbootimg args" 2020-05-16 00:17:20 +00:00
Paul Scovanner
710ca787b7 Update Security String to 2020-07-01 am: 4a475b4740 am: 69d4b8de13
Change-Id: I057865e892e6cd904b3bbb8bc1f9fdf695079f33
2020-05-15 23:04:05 +00:00
Paul Scovanner
69d4b8de13 Update Security String to 2020-07-01 am: 4a475b4740
Change-Id: I6df8e4cb400ec1c08c5ac6e2b36bd55c2b8fb15a
2020-05-15 22:36:48 +00:00
Sasha Smundak
60d03bd7db Implement android_app_set module.
Bug: 152319766
Test: manual and builtin
Change-Id: I66edc5b423898a11dbba1c3d9796c7bd4d6b4428
Merged-In: I66edc5b423898a11dbba1c3d9796c7bd4d6b4428
2020-05-15 10:47:05 -07:00
Steve Muckle
903a1ca7e1 support different boot partition sizes in aosp_arm64
The different boot images in aosp_arm64 have different partition size
requirements. Add support for defining a partition size associated with
each boot image variant.

This support is limited to aosp_arm64 currently, which is built with
recovery-as-boot.

A previous version of this change did not update the boot-debug image
AVB logic with the required macro for multiple boot partition size
support. This is now required because the aosp-arm64 boot.img is
configured as a chained AVB partition.

Bug: 156036850
Bug: 155049180
Change-Id: I66b57de91042bfd56ba54a3659843d8cf7873955
2020-05-15 10:16:17 -07:00
Colin Cross
41c3ad1f8b Don't check link type of Soong app JNI libraries
Link type checking is already done within Soong, and
SOONG_SDK_VARIANT_MODULES is not complete yet while parsing Soong
modules, skip JNI link type checking for Soong apps.

Bug: 156225490
Test: m checkbuild
Change-Id: I2f6824b180ccdd62c26497bdca527540ca22f0d7
Merged-In: I2f6824b180ccdd62c26497bdca527540ca22f0d7
(cherry picked from commit 1c8d81e5d9)
2020-05-15 10:09:57 -07:00
Jaewoong Jung
93b7ead4bf Merge "Implement android_app_set module." am: 8140bb1dc7 am: f1619724d0
Change-Id: I5cb4420ccfcde5624daac11ff9a9b34aadcb2372
2020-05-15 12:54:15 +00:00
Jaewoong Jung
8140bb1dc7 Merge "Implement android_app_set module." 2020-05-15 12:13:43 +00:00
Treehugger Robot
778727765f Merge "Don't check link type of Soong app JNI libraries" am: 642343975e am: 2f05acb7fe
Change-Id: Ieb2032ce11b64c66ae3584d32e28485c52338f53
2020-05-15 08:02:38 +00:00
Treehugger Robot
642343975e Merge "Don't check link type of Soong app JNI libraries" 2020-05-15 07:17:42 +00:00
easoncylee
9425870f73 Update auto-gen test config template with PARAMETERIZED_STRINGS
placeholder

Bug: 134509111
Test: add "test_mainline_modules: [some.apk]" to TetheringTests,
and build the modules, confirm the parameterized option is added
in the test config.

Change-Id: I0f4f837412075520153d21c9ca12cf5c3f555de7
2020-05-15 11:43:43 +08:00
Treehugger Robot
8e8444d4fe Merge changes from topic "remove_default_prop" am: 4e0bce688c am: 09dd92a862
Change-Id: If12633a2be57ffbb42d0306193a226164e77e2d4
2020-05-15 02:51:58 +00:00
Sasha Smundak
b30ff0a65b Implement android_app_set module.
Bug: 152319766
Test: manual and builtin
Change-Id: I66edc5b423898a11dbba1c3d9796c7bd4d6b4428
2020-05-14 19:06:28 -07:00
Paul Scovanner
4a475b4740 Update Security String to 2020-07-01
Bug: 156652977
Change-Id: I81539bf9bd96bdc2e0bca54b506d8a6061f0bfba
2020-05-14 19:56:33 +00:00
Colin Cross
1c8d81e5d9 Don't check link type of Soong app JNI libraries
Link type checking is already done within Soong, and
SOONG_SDK_VARIANT_MODULES is not complete yet while parsing Soong
modules, skip JNI link type checking for Soong apps.

Bug: 156225490
Test: m checkbuild
Change-Id: I2f6824b180ccdd62c26497bdca527540ca22f0d7
2020-05-14 12:50:52 -07:00
Paul Duffin
00f6a090c2 Merge "Revert "support different boot partition sizes in aosp_arm64"" am: 29beb858ef am: 61b3971e66
Change-Id: I9bfa60c9d39199735676b776cde921d9628c7209
2020-05-14 09:57:56 +00:00
Paul Duffin
29beb858ef Merge "Revert "support different boot partition sizes in aosp_arm64"" 2020-05-14 09:23:49 +00:00
Paul Duffin
b5a334d0b3 Revert "support different boot partition sizes in aosp_arm64"
This reverts commit 11c4bcf406.

Reason for revert: Broke build b/156569314

Bug: 156569314
Change-Id: I384740320acf48d09b0544e45b5a13ff0a6a163d
2020-05-14 08:40:52 +00:00
Treehugger Robot
50639bd4cb Merge "support different boot partition sizes in aosp_arm64" am: ade028ea9e am: 6f978c6b7f
Change-Id: Icaf368a8bb753eff980bc053395ad09033dfd47d
2020-05-14 07:52:31 +00:00
Jiyong Park
c47b4ee74b Remove /default.prop
It was kept for non-Treble devices, but now /system/build.prop is used
instead by having both system-configured sysprops and vendor-configured
sysprops. To summarize:

* For Treble compliant devices
- /system/build.prop has
  ADDITIONAL_DEFAULT_PROPERTIES
  PRODUCT_SYSTEM_DEFAULT_PROPERTIES
  props generated from buildinfo_common.sh
  props generated from buildinfo.sh
  props read from TARGET_SYSTEM_PROP file
  ADDITIONAL_BUILD_PROPERTIES

- /vendor/build.prop has
  PRODUCT_DEFAULT_PROPERTY_OVERRIDES
  props generated from buildinfo_common.sh
  props read from TARGET_VENDOR_PROP
  PRODUCT_PROPERTY_OVERRIDES

* For non-Treble devices,
PRODUCT_DEFAULT_PROPERTY_OVERRIDES moves from /vendor/build.prop to
/system/build.prop (just after PRODUCT_SYSTEM_DEFAULT_PROPERTIES).

Other props in /vendor/build.prop remain there but they are not used
because it's a symlink for /system/vendor/build.prop and init does not
follow symlink. Especially, PRODUCT_PROPERTY_OVERRIDES is ignored.
Someone might think this as a bug, which actually is, but this change
doesn't attempt to fix that, because 1) that's out of scope of this
change, and 2) we will anyway merge PRODUCT_PROPERTY_OVERRIDES and
PRODUCT_DEFAULT_PROPERTY_OVERRIDES into one.

Bug: 117892318
Test: TH passes

Change-Id: I867f3615ef8c06650ab2ee96642bac4f6d8ca820
2020-05-14 16:46:26 +09:00
Jiyong Park
09153e244e Remove /system/etc/prop.default
Contents that were in /system/etc/prop.default are now in
/system/build.prop.

The content is placed at the top of build.prop to keep the existing
order between the two files.

Caveat: /prop.default still remains for non-Treble devices.

Bug: 117892318
Test: TH passes
Test: inspect  /system/build.prop and check if it has contents from
the old /system/etc/prop.default file

Change-Id: Ibc74edb88904f953a1e5e6ceef44c461f381c9cf
2020-05-14 16:28:19 +09:00
Jiyong Park
b894d4bb68 Remove /vendor/default.prop
Contents that were in /vendor/default.prop are now in /vendor/build.prop

The content is placed at the top of build.prop to keep the existing
order between default.prop and builld.prop.

Bug: 117892318
Test: TH passes
Test: inspect  /vendor/build.prop and check if it has contents from
the old /vendor/default.prop file

Change-Id: Ifa1f1dca3b4f4a5fa87d26b8ee058ee706dc54bb
2020-05-14 16:19:32 +09:00
Treehugger Robot
ade028ea9e Merge "support different boot partition sizes in aosp_arm64" 2020-05-14 07:05:31 +00:00
Bowgo Tsai
d55fbd365a Enables signing for generic boot images
Enables signing for them so we can verify that the boot partition
contains a valid generic boot image during the compliance test.

This change also adds the chained partition descriptor of
boot partition into vbmeta.img, which contains the corresponding
public key used to verify the boot partition.

Bug: 151094943
Test: lunch aosp_arm64-user, `make` and use `avbtool info_image`
      to check that GKI images are properly signed.
Test: `make dist` and checks that GKI images in the image zip file
      are properly signed.
Change-Id: I2fd69964f9dc62526a813875fa9193913aa4935b
Merged-In: I2fd69964f9dc62526a813875fa9193913aa4935b
(cherry picked from commit 0f95ac7e8c)
2020-05-14 13:01:37 +08:00
Yo Chiang
5814247ed2 Access ALL_MODULES subvars with my_register_name
ALL_MODULES and subvars are registered with my_register_name.
Replace references of ALL_MODULES.$(LOCAL_MODULE).* with
ALL_MODULES.$(my_register_name).*.

Bug: 155869107
Test: TH presubmit build pass
Test: TH presubmit build noop
Change-Id: I1481c341a285dc04de86619abec3194bb92c9739
2020-05-14 04:08:42 +00:00
Yo Chiang
5e85bfe3a3 Resolve module bitness for PRODUCT_PACKAGES
PRODUCT_PACKAGES contains "simple module name" and "bitness suffix".
Call `resolve-bitness-for-modules` to resolve module bitness before
using PRODUCT_PACKAGES.

Bug: 155869107
Test: TH presubmit build_test
Test: check the value of event_log_tags_src
Change-Id: I95fcd833990b3401892c2f7859c83acd90f9e920
2020-05-14 04:07:56 +00:00
Steve Muckle
a9241f6d51 Merge "Enables signing for generic boot images" am: 70ef6fd4f2 am: 0d121f4d2e
Change-Id: I8bcd054148f76c4d065cd8526327d91f04411689
2020-05-13 20:11:49 +00:00
Steve Muckle
70ef6fd4f2 Merge "Enables signing for generic boot images" 2020-05-13 19:36:56 +00:00
Yifan Hong
010d320848 resolve merge conflicts of 7169f754cc to rvc-dev-plus-aosp
Change-Id: Ic1a44cfe929707e2fb76282dcd06f839a8159735
2020-05-13 17:44:04 +00:00
TreeHugger Robot
4d8e9cc847 Merge changes from topic "nonab_on_vab_r" into rvc-dev
* changes:
  Use add_slot_suffix function in edify script
  Support forcefully generating non-AB packages.
2020-05-13 17:26:44 +00:00
Yo Chiang
b85a140c3c Refactor bitness resolving logic of product-installed-files
* Add get-modules-for-2nd-arch helper function

Add a generic function to retrieve second arch variant module names for
TARGET, HOST and HOST_CROSS modules.
It uses ALL_MODULES.<module>.FOR_2ND_ARCH to make sure that we are
really returning second arch variant module names.
Unlike `get-32-bit-modules` this function doesn't sort its output so it
potentially saves us a tiny bit of makefile parsing time.

* Add resolve-bitness-for-modules

Factor out the common bitness-resolving logic of
`product-installed-files` and `host-installed-files` to a helper
function.
When resolving HOST_CROSS modules, the primary arch is 32-bit and
secondary arch is 64-bit.

Bug: 155869107
Test: TH
Test: check the value of product_target_FILES and product_host_FILES
Change-Id: I0fdea2e8c55e5b8edf960dbf5e17bb789abb0bf8
2020-05-13 20:42:07 +08:00
Steve Muckle
11c4bcf406 support different boot partition sizes in aosp_arm64
The different boot images in aosp_arm64 have different partition size
requirements. Add support for defining a partition size associated with
each boot image variant.

This support is limited to aosp_arm64 currently, which is built with
recovery-as-boot.

Bug: 156036850
Bug: 155049180
Change-Id: I73b70a4d52c2662c3015899632bb8a2b424108d5
2020-05-12 16:51:45 -07:00
Inseob Kim
b2daf711a3 Merge "DO NOT MERGE Add 30.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" 2020-05-11 09:53:21 +00:00
cfig
125efba2bf vendor_boot: remove INTERNAL_MKBOOTIMG_VERSION_ARGS from mkbootimg args
'os_version' and 'os_patch_level' are not defined in vendor boot image header,
so remove INTERNAL_MKBOOTIMG_VERSION_ARGS to avoid confusion

Test: lunch aosp_cf_x86_64_phone-userdebug; m vendorbootimage

Change-Id: I19c82846c9669bbd5475605e8b2457744040390d
2020-05-11 15:01:53 +08:00
Yo Chiang
9aa6f2ac0d Merge "Ban ELF prebuilts in PRODUCT_COPY_FILES" am: 6190f6910f am: 62353ad6cc
Change-Id: Iaab5fa62f64a83ceca7563aec38c6c4042d36702
2020-05-11 05:42:24 +00:00
Yo Chiang
6190f6910f Merge "Ban ELF prebuilts in PRODUCT_COPY_FILES" 2020-05-11 05:14:29 +00:00
Dan Shi
f60056f219 Merge "Revert "Add vts related artifacts to vts-core package"" am: fb42b79210 am: 7815818869
Change-Id: I60db7fb585bd76866a10fd4b6eb1b0e8d89f99f1
2020-05-08 20:38:01 +00:00
Dan Shi
c4fa187094 Revert "Add vts related artifacts to vts-core package"
This reverts commit 5e06288e7c.

Bug: 149249068
Test: build
Change-Id: I8245f1b7a4a74e133c0b7958e0f2908e4e8efd05
2020-05-08 10:52:31 -07:00
Bowgo Tsai
0f95ac7e8c Enables signing for generic boot images
Enables signing for them so we can verify that the boot partition
contains a valid generic boot image during the compliance test.

This change also adds the chained partition descriptor of
boot partition into vbmeta.img, which contains the corresponding
public key used to verify the boot partition.

Bug: 151094943
Test: lunch aosp_arm64-user, `make` and use `avbtool info_image`
      to check that GKI images are properly signed.
Test: `make dist` and checks that GKI images in the image zip file
      are properly signed.
Change-Id: I2fd69964f9dc62526a813875fa9193913aa4935b
2020-05-08 08:16:25 +00:00
Inseob Kim
f369fefbce DO NOT MERGE Add 30.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Bug: 153661471
Test: m selinux_policy
Change-Id: If1c77d867e5f454c6a159fcf9ba563dc9ec16e58
2020-05-08 11:16:29 +09:00
Jaewoong Jung
9150e7a65c Merge "Install .idsig files to test suite dirs." 2020-05-07 21:48:07 +00:00
Yifan Hong
7169f754cc Support forcefully generating non-AB packages.
Force generate a non-A/B update package when requested.

Bug: 154344887
Test: ota_from_target_files.py --force_non_ab ...
Test: apply it as well

Change-Id: I5e81eb161722e07ef50081b6a16685cbc9963ae2
2020-05-07 12:48:17 -07:00
Jaewoong Jung
c8faeb574c Install .idsig files to test suite dirs.
(This is a cherry-pick change.)

Bug: 153675112
Test: m cts && ls out/host/linux-x86/cts/android-cts/testcases/
Change-Id: I2f24f4567ed3fab1f6ad4d66cc0f798332543b8d
Merged-In: I2f24f4567ed3fab1f6ad4d66cc0f798332543b8d
2020-05-07 11:54:22 -07:00
Ivan Lozano
4d2107aff7 Merge "Add support for Rust coverage files from Soong." am: 34f82e1af2 am: 2510cdfeb7
Change-Id: Ic4b5604d9f4fc2954a142668ab15890fa673452b
2020-05-07 18:41:29 +00:00
Ivan Lozano
34f82e1af2 Merge "Add support for Rust coverage files from Soong." 2020-05-07 17:56:43 +00:00
Jaewoong Jung
6211a0fda1 Merge "Install .idsig files to test suite dirs." into rvc-dev am: d4297e0b64
Change-Id: Ie98177b2249df23a74c338e53331e50f4c08e38a
2020-05-07 15:32:01 +00:00
Jaewoong Jung
d4297e0b64 Merge "Install .idsig files to test suite dirs." into rvc-dev 2020-05-07 15:20:05 +00:00
vichang
4f61cf6540 Merge ""Move core-icu4j into i18n APEX" Attempt 2" am: 5520858b97 am: 843604223e
Change-Id: Ifaa3f0abd3962016d44e3ba27e5bbd8aedf2bf14
2020-05-07 10:12:05 +00:00